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

Small change to revert explicit sqlite3 initialize step.

Browse source
This commit is contained in:
Charles Leifer 2021-08-23 10:49:09 -05:00
parent 18551b8707
commit 9c2569771f
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/module.c
View file

@ -437,11 +437,6 @@ PyMODINIT_FUNC PyInit__sqlite3(void)
PyObject *module, *dict; PyObject *module, *dict;
PyObject *tmp_obj; PyObject *tmp_obj;
int i; int i;
int rc = sqlite3_initialize();
if (rc != SQLITE_OK) {
PyErr_SetString(PyExc_ImportError, sqlite3_errstr(rc));
return NULL;
}
module = PyModule_Create(&_sqlite3module); module = PyModule_Create(&_sqlite3module);
@ -454,7 +449,8 @@ PyMODINIT_FUNC PyInit__sqlite3(void)
(pysqlite_prepare_protocol_setup_types() < 0) || (pysqlite_prepare_protocol_setup_types() < 0) ||
(pysqlite_blob_setup_types() < 0) (pysqlite_blob_setup_types() < 0)
) { ) {
goto error; Py_XDECREF(module);
return NULL;
} }
Py_INCREF(&pysqlite_ConnectionType); Py_INCREF(&pysqlite_ConnectionType);
@ -570,11 +566,12 @@ PyMODINIT_FUNC PyInit__sqlite3(void)
/* initialize the default converters */ /* initialize the default converters */
converters_init(dict); converters_init(dict);
return module;
error: error:
sqlite3_shutdown(); if (PyErr_Occurred())
PyErr_SetString(PyExc_ImportError, MODULE_NAME ": init failed"); {
Py_XDECREF(module); PyErr_SetString(PyExc_ImportError, MODULE_NAME ": init failed");
return NULL; Py_XDECREF(module);
module = NULL;
}
return module;
} }