Skip to content

gh-95132: Correctly relay *args and **kwds from sqlite3.connect to factory #95146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erlend-aasland merged 9 commits into from
Jul 23, 2022
Merged

gh-95132: Correctly relay *args and **kwds from sqlite3.connect to factory #95146

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2c9e96f
Add test
erlend-aasland Jul 22, 2022
479959f
[alt 1] gh-95132: partially revert 185ecdc
erlend-aasland Jul 22, 2022
507e5ca
Add NEWS
erlend-aasland Jul 22, 2022
95296cb
Improve test
erlend-aasland Jul 22, 2022
b8ef03d
[alt 2] gh-95132: use vectorcall
erlend-aasland Jul 22, 2022
b144689
Add notes re docstrings
erlend-aasland Jul 22, 2022
bef0572
Further improve tests
erlend-aasland Jul 22, 2022
cf5da8e
Fix isolation_level default value
Jul 23, 2022
ca41429
Update Modules/_sqlite/module.c
Jul 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[alt 2] gh-95132: use vectorcall
  • Loading branch information
@erlend-aasland
erlend-aasland committed Jul 22, 2022
commit b8ef03dacc194306fc6e2873620157e996da2695
51 changes: 21 additions & 30 deletions Modules/_sqlite/module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ module _sqlite3
[clinic start generated code]*/
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=81e330492d57488e]*/

PyDoc_STRVAR(pysqlite_connect__doc__,
PyDoc_STRVAR(module_connect_doc,
"connect($module, /, database, timeout=5.0, detect_types=0,\n"
" isolation_level=<unrepresentable>, check_same_thread=True,\n"
Comment thread
erlend-aasland marked this conversation as resolved.
Outdated
" factory=ConnectionType, cached_statements=128, uri=False)\n"
Expand All @@ -54,40 +54,31 @@ PyDoc_STRVAR(pysqlite_connect__doc__,
"in RAM instead of on disk.");

#define PYSQLITE_CONNECT_METHODDEF \
{"connect", _PyCFunction_CAST(module_connect), METH_VARARGS|METH_KEYWORDS, pysqlite_connect__doc__},
{"connect", _PyCFunction_CAST(module_connect), METH_FASTCALL|METH_KEYWORDS, module_connect_doc},

static PyObject *
module_connect(PyObject *self, PyObject *args, PyObject *kwargs)
module_connect(PyObject *module, PyObject *const *args, Py_ssize_t nargsf,
PyObject *kwnames)
{
/* Python seems to have no way of extracting a single keyword-arg at
* C-level, so this code is redundant with the one in connection_init in
* connection.c and must always be copied from there ... */
static char *kwlist[] = {
"database", "timeout", "detect_types", "isolation_level",
"check_same_thread", "factory", "cached_statements", "uri",
NULL
};
PyObject *database;
int detect_types = 0;
PyObject *isolation_level;
PyObject *factory = NULL;
int check_same_thread = 1;
int cached_statements;
int uri = 0;
double timeout = 5.0;

if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|diOiOip", kwlist,
&database, &timeout, &detect_types,
&isolation_level, &check_same_thread,
&factory, &cached_statements, &uri))
{
return NULL;
pysqlite_state *state = pysqlite_get_state(module);
PyObject *factory = (PyObject *)state->ConnectionType;

static const int FACTORY_POS = 5;
Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
if (nargs > FACTORY_POS) {
factory = args[FACTORY_POS];
}
if (factory == NULL) {
pysqlite_state *state = pysqlite_get_state(self);
factory = (PyObject *)state->ConnectionType;
else if (kwnames != NULL) {
for (Py_ssize_t i = 0; i < PyTuple_GET_SIZE(kwnames); i++) {
PyObject *item = PyTuple_GET_ITEM(kwnames, i); // borrowed ref.
if (PyUnicode_CompareWithASCIIString(item, "factory") == 0) {
factory = args[nargs + i];
break;
}
}
}
return PyObject_Call(factory, args, kwargs);

return PyObject_Vectorcall(factory, args, nargsf, kwnames);
}

/*[clinic input]
Expand Down