Skip to content

bpo-40956: Convert sqlite3.connect and sqlite3.Connection.__init__ to AC #24421

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
pablogsal merged 17 commits into from
Jun 20, 2021
Merged

bpo-40956: Convert sqlite3.connect and sqlite3.Connection.__init__ to AC #24421

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8192606
Convert _sqlite3.connect() and _sqlite3.Connection.__init__() to Argu…
Jun 14, 2020
b72a29c
Add NEWS
Feb 2, 2021
d361aeb
Add test for 'check_same_thread' keyword
Mar 8, 2021
a861358
Add test for 'database' keyword
Mar 8, 2021
1ccf5e5
Merge branch 'main' into bpo-40956/finale
Jun 5, 2021
07164cb
Harden
Jun 5, 2021
a1e88c9
Simplify ref handling
Jun 5, 2021
4977d78
Use PyObject_CallFunction iso. PyObject_CallFunctionObjArgs in sqlite…
Jun 5, 2021
1b2720f
Adjust comment
Jun 5, 2021
c7cd9ee
Merge branch 'main' into bpo-40956/finale
Jun 6, 2021
39ed36b
Remove unused var from test_dont_check_same_thread
Jun 6, 2021
754fdc6
Resolve conflict: cached_statements now defaults to 128, not 100
Jun 13, 2021
e59af3b
Clinic
Jun 13, 2021
ad345e0
Merge branch 'main' into bpo-40956/finale
Jun 15, 2021
af0fc7e
Address review: wrap test_dont_check_same_thread with threading_helpe…
Jun 15, 2021
98f1a9d
Explain Py_DECREF of converted arguments
Jun 17, 2021
89926af
Merge branch 'main' into bpo-40956/finale
Jun 17, 2021
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
Use PyObject_CallFunction iso. PyObject_CallFunctionObjArgs in sqlite… 
…3.connect
  • Loading branch information
Erlend E. Aasland committed Jun 5, 2021
commit 4977d783eea356e3d5c991d00feaa51e8603c474
35 changes: 6 additions & 29 deletions Modules/_sqlite/module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ pysqlite_connect_impl(PyObject *module, PyObject *database, double timeout,
int cached_statements, int uri)
/*[clinic end generated code: output=450ac9078b4868bb input=938c5058ce37130a]*/
{
PyObject *result = NULL;

if (isolation_level == NULL) {
isolation_level = PyUnicode_FromString("");
if (isolation_level == NULL) {
Expand All @@ -102,34 +100,13 @@ pysqlite_connect_impl(PyObject *module, PyObject *database, double timeout,
else {
Py_INCREF(isolation_level);
}

PyObject *obj_timeout = PyFloat_FromDouble(timeout);
PyObject *obj_detect_types = PyLong_FromLong(detect_types);
PyObject *obj_check_same_thread = PyLong_FromLong(check_same_thread);
PyObject *obj_cached_statements = PyLong_FromLong(cached_statements);
PyObject *obj_uri = PyBool_FromLong(uri);
if (obj_timeout == NULL || obj_detect_types == NULL ||
obj_check_same_thread == NULL || obj_cached_statements == NULL ||
obj_uri == NULL)
{
goto error;
}

result = PyObject_CallFunctionObjArgs(factory, database, obj_timeout,
obj_detect_types, isolation_level,
obj_check_same_thread, factory,
obj_cached_statements, obj_uri,
NULL);

error:
PyObject *res = PyObject_CallFunction(factory, "OdiOiOii", database,
timeout, detect_types,
isolation_level, check_same_thread,
factory, cached_statements, uri);
Py_DECREF(database);
Comment thread
erlend-aasland marked this conversation as resolved.
Outdated
Py_DECREF(isolation_level);
Py_XDECREF(database);
Py_XDECREF(obj_timeout);
Py_XDECREF(obj_detect_types);
Py_XDECREF(obj_check_same_thread);
Py_XDECREF(obj_cached_statements);
Py_XDECREF(obj_uri);
return result;
return res;
}

/*[clinic input]
Expand Down