Skip to content

Commit

Permalink
Remove more Python 3.8
Browse files Browse the repository at this point in the history
  • Loading branch information
rogerbinns committed Nov 15, 2024
1 parent df3cc34 commit 28b2dff
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 28 deletions.
5 changes: 3 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
:target: https://rogerbinns.github.io/apsw/

APSW stands for **A**\ nother **P**\ ython **S**\ QLite **W**\ rapper. APSW
supports CPython 3.8 onwards.
supports CPython 3.9 onwards.

About
=====
Expand All @@ -15,7 +15,8 @@ embedded relational database engine from Python, and the most out of
Python from SQLite. APSW glues together the complete `SQLite C API
<https://sqlite.org/c3ref/intro.html>`__ and `Python's C API
<https://docs.python.org/3/c-api/index.html>`__, staying up to date
with both SQLite and Python.
with both SQLite and Python. This includes `full text search
<https://rogerbinns.github.io/apsw/textsearch.html>`.


It is recommended to use the builtin `sqlite3 module
Expand Down
4 changes: 2 additions & 2 deletions doc/about.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ About

**APSW** |version| **released** |today|

Use with `SQLite <https://sqlite.org/>`__ 3.44 or later, `Python
<https://www.python.org/downloads/>`__ 3.8 and later.
Use with `SQLite <https://sqlite.org/>`__ 3.47 or later, `Python
<https://www.python.org/downloads/>`__ 3.9 and later.


What APSW does
Expand Down
2 changes: 1 addition & 1 deletion doc/pysqlite.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ module:

* APSW stays up to date with Python, including releases under
development as well as older still supported releases. The current
APSW release brings the most recent SQLite to Python 3.8 all the way
APSW release brings the most recent SQLite to Python 3.9 all the way
through Python 3.14.

* APSW gives all functionality of SQLite including :ref:`virtual
Expand Down
23 changes: 0 additions & 23 deletions src/pyutil.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,29 +39,6 @@ Py_IsNone(const PyObject *val)

#endif

/* Vectorcall added in 3.9 officially and provisional in 3.8 */
#if PY_VERSION_HEX < 0x03090000
#undef PyObject_Vectorcall
static PyObject *PyObject_Vectorcall(PyObject *callable, PyObject *const *args, size_t nargsf, PyObject *kwnames)
{
return _PyObject_Vectorcall(callable, args, nargsf, kwnames);
}

/* The actual CPython implementation of this is a little more
sophisticated but doesn't matter for our usage */
#undef PyObject_VectorcallMethod
static PyObject *PyObject_VectorcallMethod(PyObject *name, PyObject *const *args, size_t nargsf, PyObject *kwnames)
{
PyObject *res = NULL, *callable = PyObject_GetAttr(args[0], name);
if (callable)
{
res = PyObject_Vectorcall(callable, args + 1, PyVectorcall_NARGS(nargsf) - 1, kwnames);
Py_DECREF(callable);
}
return res;
}
#endif

/* used in calls to AddTraceBackHere where O format takes non-null but
we often have null so convert to None. This can't be done as a portable
macro because v would end up double evaluated */
Expand Down

0 comments on commit 28b2dff

Please sign in to comment.