diff options
| author | Erlend Egeberg Aasland <erlend.aasland@innova.no> | 2021-05-02 22:55:33 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-02 22:55:33 (GMT) |
| commit | 10665ac37313560fe87460cf4a5c26677049bf62 (patch) | |
| tree | 66411ccfdde206b7e82a978ca8a2d4de27733f64 /Modules/_sqlite | |
| parent | db3ce79469ce9f8168ea4ac3e186be8e3fe44105 (diff) | |
| download | cpython-10665ac37313560fe87460cf4a5c26677049bf62.zip cpython-10665ac37313560fe87460cf4a5c26677049bf62.tar.gz cpython-10665ac37313560fe87460cf4a5c26677049bf62.tar.bz2 | |
bpo-43434: Move sqlite3.connect audit events to sqlite3.Connection.__init__ (GH-25818)
(cherry picked from commit c96cc089f60d2bf7e003c27413c3239ee9de2990)
Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
Diffstat (limited to 'Modules/_sqlite')
| -rw-r--r-- | Modules/_sqlite/connection.c | 4 | ||||
| -rw-r--r-- | Modules/_sqlite/module.c | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index b6188a3..d1d5f9f 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -98,6 +98,10 @@ int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject return -1; } + if (PySys_Audit("sqlite3.connect", "O", database_obj) < 0) { + return -1; + } + database = PyBytes_AsString(database_obj); self->initialized = 1; diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c index 9fe0dc9..d3ce283 100644 --- a/Modules/_sqlite/module.c +++ b/Modules/_sqlite/module.c @@ -71,8 +71,6 @@ static PyObject* module_connect(PyObject* self, PyObject* args, PyObject* int uri = 0; double timeout = 5.0; - PyObject* result; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|diOiOip", kwlist, &database, &timeout, &detect_types, &isolation_level, &check_same_thread, @@ -85,13 +83,7 @@ static PyObject* module_connect(PyObject* self, PyObject* args, PyObject* factory = (PyObject*)&pysqlite_ConnectionType; } - if (PySys_Audit("sqlite3.connect", "O", database) < 0) { - return NULL; - } - - result = PyObject_Call(factory, args, kwargs); - - return result; + return PyObject_Call(factory, args, kwargs); } PyDoc_STRVAR(module_connect_doc, |