prefix internal sqlite symbols with _pysqlite_ (GH-8215)
(cherry picked from commit 7762e4d387
)
Co-authored-by: Benjamin Peterson <benjamin@python.org>
This commit is contained in:
parent
ba10da1373
commit
c3bdea4c6c
|
@ -617,7 +617,7 @@ void _pysqlite_func_callback(sqlite3_context* context, int argc, sqlite3_value**
|
|||
Py_DECREF(py_retval);
|
||||
}
|
||||
if (!ok) {
|
||||
if (_enable_callback_tracebacks) {
|
||||
if (_pysqlite_enable_callback_tracebacks) {
|
||||
PyErr_Print();
|
||||
} else {
|
||||
PyErr_Clear();
|
||||
|
@ -649,7 +649,7 @@ static void _pysqlite_step_callback(sqlite3_context *context, int argc, sqlite3_
|
|||
|
||||
if (PyErr_Occurred()) {
|
||||
*aggregate_instance = 0;
|
||||
if (_enable_callback_tracebacks) {
|
||||
if (_pysqlite_enable_callback_tracebacks) {
|
||||
PyErr_Print();
|
||||
} else {
|
||||
PyErr_Clear();
|
||||
|
@ -673,7 +673,7 @@ static void _pysqlite_step_callback(sqlite3_context *context, int argc, sqlite3_
|
|||
Py_DECREF(args);
|
||||
|
||||
if (!function_result) {
|
||||
if (_enable_callback_tracebacks) {
|
||||
if (_pysqlite_enable_callback_tracebacks) {
|
||||
PyErr_Print();
|
||||
} else {
|
||||
PyErr_Clear();
|
||||
|
@ -723,7 +723,7 @@ void _pysqlite_final_callback(sqlite3_context* context)
|
|||
Py_DECREF(function_result);
|
||||
}
|
||||
if (!ok) {
|
||||
if (_enable_callback_tracebacks) {
|
||||
if (_pysqlite_enable_callback_tracebacks) {
|
||||
PyErr_Print();
|
||||
} else {
|
||||
PyErr_Clear();
|
||||
|
@ -883,7 +883,7 @@ static int _authorizer_callback(void* user_arg, int action, const char* arg1, co
|
|||
ret = PyObject_CallFunction((PyObject*)user_arg, "issss", action, arg1, arg2, dbname, access_attempt_source);
|
||||
|
||||
if (ret == NULL) {
|
||||
if (_enable_callback_tracebacks)
|
||||
if (_pysqlite_enable_callback_tracebacks)
|
||||
PyErr_Print();
|
||||
else
|
||||
PyErr_Clear();
|
||||
|
@ -894,7 +894,7 @@ static int _authorizer_callback(void* user_arg, int action, const char* arg1, co
|
|||
if (PyLong_Check(ret)) {
|
||||
rc = _PyLong_AsInt(ret);
|
||||
if (rc == -1 && PyErr_Occurred()) {
|
||||
if (_enable_callback_tracebacks)
|
||||
if (_pysqlite_enable_callback_tracebacks)
|
||||
PyErr_Print();
|
||||
else
|
||||
PyErr_Clear();
|
||||
|
@ -921,7 +921,7 @@ static int _progress_handler(void* user_arg)
|
|||
ret = _PyObject_CallNoArg((PyObject*)user_arg);
|
||||
|
||||
if (!ret) {
|
||||
if (_enable_callback_tracebacks) {
|
||||
if (_pysqlite_enable_callback_tracebacks) {
|
||||
PyErr_Print();
|
||||
} else {
|
||||
PyErr_Clear();
|
||||
|
@ -956,7 +956,7 @@ static void _trace_callback(void* user_arg, const char* statement_string)
|
|||
if (ret) {
|
||||
Py_DECREF(ret);
|
||||
} else {
|
||||
if (_enable_callback_tracebacks) {
|
||||
if (_pysqlite_enable_callback_tracebacks) {
|
||||
PyErr_Print();
|
||||
} else {
|
||||
PyErr_Clear();
|
||||
|
|
|
@ -109,7 +109,7 @@ PyObject* _pysqlite_get_converter(PyObject* key)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
retval = PyDict_GetItem(converters, upcase_key);
|
||||
retval = PyDict_GetItem(_pysqlite_converters, upcase_key);
|
||||
Py_DECREF(upcase_key);
|
||||
|
||||
return retval;
|
||||
|
@ -539,7 +539,7 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*
|
|||
if (rc != SQLITE_DONE && rc != SQLITE_ROW) {
|
||||
if (PyErr_Occurred()) {
|
||||
/* there was an error that occurred in a user-defined callback */
|
||||
if (_enable_callback_tracebacks) {
|
||||
if (_pysqlite_enable_callback_tracebacks) {
|
||||
PyErr_Print();
|
||||
} else {
|
||||
PyErr_Clear();
|
||||
|
|
|
@ -46,8 +46,8 @@ PyObject *pysqlite_IntegrityError = NULL;
|
|||
PyObject *pysqlite_DataError = NULL;
|
||||
PyObject *pysqlite_NotSupportedError = NULL;
|
||||
|
||||
PyObject* converters = NULL;
|
||||
int _enable_callback_tracebacks = 0;
|
||||
PyObject* _pysqlite_converters = NULL;
|
||||
int _pysqlite_enable_callback_tracebacks = 0;
|
||||
int pysqlite_BaseTypeAdapted = 0;
|
||||
|
||||
static PyObject* module_connect(PyObject* self, PyObject* args, PyObject*
|
||||
|
@ -204,7 +204,7 @@ static PyObject* module_register_converter(PyObject* self, PyObject* args)
|
|||
goto error;
|
||||
}
|
||||
|
||||
if (PyDict_SetItem(converters, name, callable) != 0) {
|
||||
if (PyDict_SetItem(_pysqlite_converters, name, callable) != 0) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
|
@ -222,7 +222,7 @@ Registers a converter with pysqlite. Non-standard.");
|
|||
|
||||
static PyObject* enable_callback_tracebacks(PyObject* self, PyObject* args)
|
||||
{
|
||||
if (!PyArg_ParseTuple(args, "i", &_enable_callback_tracebacks)) {
|
||||
if (!PyArg_ParseTuple(args, "i", &_pysqlite_enable_callback_tracebacks)) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -236,12 +236,12 @@ Enable or disable callback functions throwing errors to stderr.");
|
|||
|
||||
static void converters_init(PyObject* dict)
|
||||
{
|
||||
converters = PyDict_New();
|
||||
if (!converters) {
|
||||
_pysqlite_converters = PyDict_New();
|
||||
if (!_pysqlite_converters) {
|
||||
return;
|
||||
}
|
||||
|
||||
PyDict_SetItemString(dict, "converters", converters);
|
||||
PyDict_SetItemString(dict, "converters", _pysqlite_converters);
|
||||
}
|
||||
|
||||
static PyMethodDef module_methods[] = {
|
||||
|
|
|
@ -42,9 +42,9 @@ extern PyObject* pysqlite_NotSupportedError;
|
|||
* functions, that convert the SQL value to the appropriate Python value.
|
||||
* The key is uppercase.
|
||||
*/
|
||||
extern PyObject* converters;
|
||||
extern PyObject* _pysqlite_converters;
|
||||
|
||||
extern int _enable_callback_tracebacks;
|
||||
extern int _pysqlite_enable_callback_tracebacks;
|
||||
extern int pysqlite_BaseTypeAdapted;
|
||||
|
||||
#define PARSE_DECLTYPES 1
|
||||
|
|
Loading…
Reference in New Issue