mig5/bouquin-sqlcipher4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply some patches from upstream.

Browse source
This commit is contained in:
Charles Leifer 2021-05-14 10:13:01 -05:00
parent 0cfea11bb4
commit 6247967ad2
7 changed files with 71 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/module.c
View file

@ -74,8 +74,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|diOiOipiz", kwlist,
&database, &timeout, &detect_types,
&isolation_level, &check_same_thread,
@ -89,9 +87,7 @@ static PyObject* module_connect(PyObject* self, PyObject* args, PyObject*
factory = (PyObject*)&pysqlite_ConnectionType;
}
result = PyObject_Call(factory, args, kwargs);
return result;
return PyObject_Call(factory, args, kwargs);
}
PyDoc_STRVAR(module_connect_doc,
@ -441,6 +437,11 @@ PyMODINIT_FUNC PyInit__sqlite3(void)
PyObject *module, *dict;
PyObject *tmp_obj;
int i;
int rc = sqlite3_initialize();
if (rc != SQLITE_OK) {
PyErr_SetString(PyExc_ImportError, sqlite3_errstr(rc));
return NULL;
}
module = PyModule_Create(&_sqlite3module);
@ -453,8 +454,7 @@ PyMODINIT_FUNC PyInit__sqlite3(void)
(pysqlite_prepare_protocol_setup_types() < 0) ||
(pysqlite_blob_setup_types() < 0)
) {
Py_XDECREF(module);
return NULL;
goto error;
}
Py_INCREF(&pysqlite_ConnectionType);
@ -570,12 +570,11 @@ PyMODINIT_FUNC PyInit__sqlite3(void)
/* initialize the default converters */
converters_init(dict);
error:
if (PyErr_Occurred())
{
PyErr_SetString(PyExc_ImportError, MODULE_NAME ": init failed");
Py_DECREF(module);
module = NULL;
}
return module;
error:
sqlite3_shutdown();
PyErr_SetString(PyExc_ImportError, MODULE_NAME ": init failed");
Py_XDECREF(module);
return NULL;
}