diff options
author | Benjamin Peterson <benjamin@python.org> | 2018-07-09 22:36:49 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-09 22:36:49 -0700 |
commit | dc39a59bc7072f540b7bab5b7db78ec04423700a (patch) | |
tree | be3a4f672b641e2f012eb6ccfc432a6ef566972d /Modules | |
parent | 695ecd9dc6b9c08775fab517f77aba77d13aaef4 (diff) | |
download | cpython-git-dc39a59bc7072f540b7bab5b7db78ec04423700a.tar.gz |
[2.7] prefix internal sqlite symbols with _pysqlite_ (GH-8215). (GH-8217)
(cherry picked from commit 7762e4d3872818272800dfbd8e1d8e3a689eb8f2)
Co-authored-by: Benjamin Peterson <benjamin@python.org>
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/_sqlite/connection.c | 12 | ||||
-rw-r--r-- | Modules/_sqlite/cursor.c | 4 | ||||
-rw-r--r-- | Modules/_sqlite/module.c | 16 | ||||
-rw-r--r-- | Modules/_sqlite/module.h | 4 |
4 files changed, 18 insertions, 18 deletions
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index 0603b4307b..c3f39fd78a 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -675,7 +675,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(); @@ -711,7 +711,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(); @@ -735,7 +735,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(); @@ -781,7 +781,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(); @@ -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); if (!ret) { - if (_enable_callback_tracebacks) { + if (_pysqlite_enable_callback_tracebacks) { PyErr_Print(); } else { PyErr_Clear(); @@ -972,7 +972,7 @@ static int _progress_handler(void* user_arg) ret = PyObject_CallFunction((PyObject*)user_arg, ""); if (!ret) { - if (_enable_callback_tracebacks) { + if (_pysqlite_enable_callback_tracebacks) { PyErr_Print(); } else { PyErr_Clear(); diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c index b7c2d798da..e5cd721a5e 100644 --- a/Modules/_sqlite/cursor.c +++ b/Modules/_sqlite/cursor.c @@ -147,7 +147,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; @@ -655,7 +655,7 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* } else { 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(); diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c index 33611d9dad..fa45edfff9 100644 --- a/Modules/_sqlite/module.c +++ b/Modules/_sqlite/module.c @@ -39,8 +39,8 @@ PyObject* pysqlite_Error, *pysqlite_Warning, *pysqlite_InterfaceError, *pysqlite *pysqlite_InternalError, *pysqlite_OperationalError, *pysqlite_ProgrammingError, *pysqlite_IntegrityError, *pysqlite_DataError, *pysqlite_NotSupportedError, *pysqlite_OptimizedUnicode; -PyObject* converters; -int _enable_callback_tracebacks; +PyObject* _pysqlite_converters; +int _pysqlite_enable_callback_tracebacks; int pysqlite_BaseTypeAdapted; static PyObject* module_connect(PyObject* self, PyObject* args, PyObject* @@ -190,7 +190,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; } @@ -208,7 +208,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; } @@ -223,12 +223,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[] = { @@ -428,7 +428,7 @@ PyMODINIT_FUNC init_sqlite3(void) /* initialize the default converters */ converters_init(dict); - _enable_callback_tracebacks = 0; + _pysqlite_enable_callback_tracebacks = 0; pysqlite_BaseTypeAdapted = 0; diff --git a/Modules/_sqlite/module.h b/Modules/_sqlite/module.h index 9b647c68a1..322452fdd9 100644 --- a/Modules/_sqlite/module.h +++ b/Modules/_sqlite/module.h @@ -44,9 +44,9 @@ extern PyObject* pysqlite_OptimizedUnicode; * 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 |