_pysqlite_connection_begin() now returns an int

Author: Erlend E. Aasland

Modules/_sqlite/connection.c

@@ -372,7 +372,8 @@ int pysqlite_check_connection(pysqlite_Connection* con)
     }
 }
 
-PyObject* _pysqlite_connection_begin(pysqlite_Connection* self)
+int
+_pysqlite_connection_begin(pysqlite_Connection *self)
 {
     int rc;
     sqlite3_stmt* statement;
@@ -402,10 +403,9 @@ PyObject* _pysqlite_connection_begin(pysqlite_Connection* self)
 
 error:
     if (PyErr_Occurred()) {
-        return NULL;
-    } else {
-        Py_RETURN_NONE;
+        return -1;
     }
+    return 0;
 }
 
 /*[clinic input]

Modules/_sqlite/connection.h

@@ -108,7 +108,7 @@ typedef struct
 
 extern PyTypeObject *pysqlite_ConnectionType;
 
-PyObject* _pysqlite_connection_begin(pysqlite_Connection* self);
+int _pysqlite_connection_begin(pysqlite_Connection *self);
 
 int pysqlite_connection_register_cursor(pysqlite_Connection* connection, PyObject* cursor);
 int pysqlite_check_thread(pysqlite_Connection* self);

Modules/_sqlite/cursor.c

@@ -404,7 +404,6 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
     int i;
     int rc;
     PyObject* func_args;
-    PyObject* result;
     int numcols;
     PyObject* column_name;
     sqlite_int64 lastrowid;
@@ -505,11 +504,9 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
        SELECT is the only exception. See #9924. */
     if (self->connection->begin_statement && self->statement->is_dml) {
         if (sqlite3_get_autocommit(self->connection->db)) {
-            result = _pysqlite_connection_begin(self->connection);
-            if (!result) {
+            if (_pysqlite_connection_begin(self->connection) < 0) {
                 goto error;
             }
-            Py_DECREF(result);
         }
     }