Commit dc39a59b authored by Benjamin Peterson's avatar Benjamin Peterson Committed by GitHub

[2.7] prefix internal sqlite symbols with _pysqlite_ (GH-8215). (GH-8217)

(cherry picked from commit 7762e4d3)
Co-authored-by: default avatarBenjamin Peterson <benjamin@python.org>
parent 695ecd9d
...@@ -675,7 +675,7 @@ void _pysqlite_func_callback(sqlite3_context* context, int argc, sqlite3_value** ...@@ -675,7 +675,7 @@ void _pysqlite_func_callback(sqlite3_context* context, int argc, sqlite3_value**
Py_DECREF(py_retval); Py_DECREF(py_retval);
} }
if (!ok) { if (!ok) {
if (_enable_callback_tracebacks) { if (_pysqlite_enable_callback_tracebacks) {
PyErr_Print(); PyErr_Print();
} else { } else {
PyErr_Clear(); PyErr_Clear();
...@@ -711,7 +711,7 @@ static void _pysqlite_step_callback(sqlite3_context *context, int argc, sqlite3_ ...@@ -711,7 +711,7 @@ static void _pysqlite_step_callback(sqlite3_context *context, int argc, sqlite3_
if (PyErr_Occurred()) { if (PyErr_Occurred()) {
*aggregate_instance = 0; *aggregate_instance = 0;
if (_enable_callback_tracebacks) { if (_pysqlite_enable_callback_tracebacks) {
PyErr_Print(); PyErr_Print();
} else { } else {
PyErr_Clear(); PyErr_Clear();
...@@ -735,7 +735,7 @@ static void _pysqlite_step_callback(sqlite3_context *context, int argc, sqlite3_ ...@@ -735,7 +735,7 @@ static void _pysqlite_step_callback(sqlite3_context *context, int argc, sqlite3_
Py_DECREF(args); Py_DECREF(args);
if (!function_result) { if (!function_result) {
if (_enable_callback_tracebacks) { if (_pysqlite_enable_callback_tracebacks) {
PyErr_Print(); PyErr_Print();
} else { } else {
PyErr_Clear(); PyErr_Clear();
...@@ -781,7 +781,7 @@ void _pysqlite_final_callback(sqlite3_context* context) ...@@ -781,7 +781,7 @@ void _pysqlite_final_callback(sqlite3_context* context)
Py_DECREF(function_result); Py_DECREF(function_result);
} }
if (!ok) { if (!ok) {
if (_enable_callback_tracebacks) { if (_pysqlite_enable_callback_tracebacks) {
PyErr_Print(); PyErr_Print();
} else { } else {
PyErr_Clear(); PyErr_Clear();
...@@ -936,7 +936,7 @@ static int _authorizer_callback(void* user_arg, int action, const char* arg1, co ...@@ -936,7 +936,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); ret = PyObject_CallFunction((PyObject*)user_arg, "issss", action, arg1, arg2, dbname, access_attempt_source);
if (!ret) { if (!ret) {
if (_enable_callback_tracebacks) { if (_pysqlite_enable_callback_tracebacks) {
PyErr_Print(); PyErr_Print();
} else { } else {
PyErr_Clear(); PyErr_Clear();
...@@ -972,7 +972,7 @@ static int _progress_handler(void* user_arg) ...@@ -972,7 +972,7 @@ static int _progress_handler(void* user_arg)
ret = PyObject_CallFunction((PyObject*)user_arg, ""); ret = PyObject_CallFunction((PyObject*)user_arg, "");
if (!ret) { if (!ret) {
if (_enable_callback_tracebacks) { if (_pysqlite_enable_callback_tracebacks) {
PyErr_Print(); PyErr_Print();
} else { } else {
PyErr_Clear(); PyErr_Clear();
......
...@@ -147,7 +147,7 @@ PyObject* _pysqlite_get_converter(PyObject* key) ...@@ -147,7 +147,7 @@ PyObject* _pysqlite_get_converter(PyObject* key)
return NULL; return NULL;
} }
retval = PyDict_GetItem(converters, upcase_key); retval = PyDict_GetItem(_pysqlite_converters, upcase_key);
Py_DECREF(upcase_key); Py_DECREF(upcase_key);
return retval; return retval;
...@@ -655,7 +655,7 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* ...@@ -655,7 +655,7 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*
} else { } else {
if (PyErr_Occurred()) { if (PyErr_Occurred()) {
/* there was an error that occurred in a user-defined callback */ /* there was an error that occurred in a user-defined callback */
if (_enable_callback_tracebacks) { if (_pysqlite_enable_callback_tracebacks) {
PyErr_Print(); PyErr_Print();
} else { } else {
PyErr_Clear(); PyErr_Clear();
......
...@@ -39,8 +39,8 @@ PyObject* pysqlite_Error, *pysqlite_Warning, *pysqlite_InterfaceError, *pysqlite ...@@ -39,8 +39,8 @@ PyObject* pysqlite_Error, *pysqlite_Warning, *pysqlite_InterfaceError, *pysqlite
*pysqlite_InternalError, *pysqlite_OperationalError, *pysqlite_ProgrammingError, *pysqlite_InternalError, *pysqlite_OperationalError, *pysqlite_ProgrammingError,
*pysqlite_IntegrityError, *pysqlite_DataError, *pysqlite_NotSupportedError, *pysqlite_OptimizedUnicode; *pysqlite_IntegrityError, *pysqlite_DataError, *pysqlite_NotSupportedError, *pysqlite_OptimizedUnicode;
PyObject* converters; PyObject* _pysqlite_converters;
int _enable_callback_tracebacks; int _pysqlite_enable_callback_tracebacks;
int pysqlite_BaseTypeAdapted; int pysqlite_BaseTypeAdapted;
static PyObject* module_connect(PyObject* self, PyObject* args, PyObject* static PyObject* module_connect(PyObject* self, PyObject* args, PyObject*
...@@ -190,7 +190,7 @@ static PyObject* module_register_converter(PyObject* self, PyObject* args) ...@@ -190,7 +190,7 @@ static PyObject* module_register_converter(PyObject* self, PyObject* args)
goto error; goto error;
} }
if (PyDict_SetItem(converters, name, callable) != 0) { if (PyDict_SetItem(_pysqlite_converters, name, callable) != 0) {
goto error; goto error;
} }
...@@ -208,7 +208,7 @@ Registers a converter with pysqlite. Non-standard."); ...@@ -208,7 +208,7 @@ Registers a converter with pysqlite. Non-standard.");
static PyObject* enable_callback_tracebacks(PyObject* self, PyObject* args) 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; return NULL;
} }
...@@ -223,12 +223,12 @@ Enable or disable callback functions throwing errors to stderr."); ...@@ -223,12 +223,12 @@ Enable or disable callback functions throwing errors to stderr.");
static void converters_init(PyObject* dict) static void converters_init(PyObject* dict)
{ {
converters = PyDict_New(); _pysqlite_converters = PyDict_New();
if (!converters) { if (!_pysqlite_converters) {
return; return;
} }
PyDict_SetItemString(dict, "converters", converters); PyDict_SetItemString(dict, "converters", _pysqlite_converters);
} }
static PyMethodDef module_methods[] = { static PyMethodDef module_methods[] = {
...@@ -428,7 +428,7 @@ PyMODINIT_FUNC init_sqlite3(void) ...@@ -428,7 +428,7 @@ PyMODINIT_FUNC init_sqlite3(void)
/* initialize the default converters */ /* initialize the default converters */
converters_init(dict); converters_init(dict);
_enable_callback_tracebacks = 0; _pysqlite_enable_callback_tracebacks = 0;
pysqlite_BaseTypeAdapted = 0; pysqlite_BaseTypeAdapted = 0;
......
...@@ -44,9 +44,9 @@ extern PyObject* pysqlite_OptimizedUnicode; ...@@ -44,9 +44,9 @@ extern PyObject* pysqlite_OptimizedUnicode;
* functions, that convert the SQL value to the appropriate Python value. * functions, that convert the SQL value to the appropriate Python value.
* The key is uppercase. * 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; extern int pysqlite_BaseTypeAdapted;
#define PARSE_DECLTYPES 1 #define PARSE_DECLTYPES 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment