Move sqlite3.InterfaceError to global state

Author: Erlend E. Aasland

Modules/_sqlite/connection.c

@@ -191,7 +191,7 @@ pysqlite_connection_init(pysqlite_Connection *self, PyObject *args,
     pysqlite_state *state = pysqlite_get_state(NULL);
     self->Warning               = state->Warning;
     self->Error                 = state->Error;
-    self->InterfaceError        = pysqlite_InterfaceError;
+    self->InterfaceError        = state->InterfaceError;
     self->DatabaseError         = pysqlite_DatabaseError;
     self->DataError             = pysqlite_DataError;
     self->OperationalError      = pysqlite_OperationalError;

Modules/_sqlite/cursor.c

@@ -272,7 +272,8 @@ _pysqlite_fetch_one_row(pysqlite_Cursor* self)
     PyObject* error_msg;
 
     if (self->reset) {
-        PyErr_SetString(pysqlite_InterfaceError, errmsg_fetch_across_rollback);
+        pysqlite_state *state = pysqlite_get_state(NULL);
+        PyErr_SetString(state->InterfaceError, errmsg_fetch_across_rollback);
         return NULL;
     }
 
@@ -822,7 +823,8 @@ pysqlite_cursor_iternext(pysqlite_Cursor *self)
     }
 
     if (self->reset) {
-        PyErr_SetString(pysqlite_InterfaceError, errmsg_fetch_across_rollback);
+        pysqlite_state *state = pysqlite_get_state(NULL);
+        PyErr_SetString(state->InterfaceError, errmsg_fetch_across_rollback);
         return NULL;
     }
 

Modules/_sqlite/module.c

@@ -43,7 +43,6 @@ module _sqlite3
 
 /* static objects at module-level */
 
-PyObject *pysqlite_InterfaceError = NULL;
 PyObject *pysqlite_DatabaseError = NULL;
 PyObject *pysqlite_InternalError = NULL;
 PyObject *pysqlite_OperationalError = NULL;
@@ -413,7 +412,7 @@ PyMODINIT_FUNC PyInit__sqlite3(void)
     ADD_EXCEPTION(module, "Warning", state->Warning, PyExc_Exception);
 
     /* Error subclasses */
-    ADD_EXCEPTION(module, "InterfaceError", pysqlite_InterfaceError,
+    ADD_EXCEPTION(module, "InterfaceError", state->InterfaceError,
                   state->Error);
     ADD_EXCEPTION(module, "DatabaseError", pysqlite_DatabaseError,
                   state->Error);

Modules/_sqlite/module.h

@@ -31,6 +31,7 @@
 
 typedef struct {
     PyObject *Error;
+    PyObject *InterfaceError;
     PyObject *Warning;
     PyObject *lru_cache;
     PyTypeObject *ConnectionType;
@@ -48,7 +49,6 @@ pysqlite_get_state(PyObject *Py_UNUSED(module))
     return &pysqlite_global_state;
 }
 
-extern PyObject* pysqlite_InterfaceError;
 extern PyObject* pysqlite_DatabaseError;
 extern PyObject* pysqlite_InternalError;
 extern PyObject* pysqlite_OperationalError;

Modules/_sqlite/statement.c

@@ -288,7 +288,9 @@ void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* para
 
             if (rc != SQLITE_OK) {
                 if (!PyErr_Occurred()) {
-                    PyErr_Format(pysqlite_InterfaceError, "Error binding parameter %d - probably unsupported type.", i);
+                    PyErr_Format(state->InterfaceError,
+                                 "Error binding parameter %d - "
+                                 "probably unsupported type.", i);
                 }
                 return;
             }
@@ -342,7 +344,9 @@ void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* para
 
             if (rc != SQLITE_OK) {
                 if (!PyErr_Occurred()) {
-                    PyErr_Format(pysqlite_InterfaceError, "Error binding parameter :%s - probably unsupported type.", binding_name);
+                    PyErr_Format(state->InterfaceError,
+                                 "Error binding parameter :%s - "
+                                 "probably unsupported type.", binding_name);
                 }
                 return;
            }