Fix for CONPY-131:

Instead of using PyStructSequence_New (broken in Python3.6) use a static struct which will be initialized voa PyStructSequence_Init() call.
mariadb-corporation · Nov 16, 2020 · f6be6ba · f6be6ba
1 parent 37864dd
commit f6be6ba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/include/mariadb_python.h b/include/mariadb_python.h
@@ -255,7 +255,7 @@ typedef struct {
     unsigned long statement_len;
     PyObject **values;
     PyStructSequence_Field *sequence_fields;
-    PyTypeObject *sequence_type;
+    PyTypeObject sequence_type;
     unsigned long prefetch_rows;
     unsigned long cursor_type;
     int64_t affected_rows;

diff --git a/mariadb/mariadb_cursor.c b/mariadb/mariadb_cursor.c
@@ -445,7 +445,6 @@ void MrdbCursor_clear(MrdbCursor *self, uint8_t new_stmt)
     if (self->sequence_fields)
     {
         MARIADB_FREE_MEM(self->sequence_fields);
-        Py_DECREF((PyObject *)self->sequence_type);
     }
     self->fields= NULL;
     self->row_count= 0;
@@ -573,7 +572,7 @@ static int Mrdb_GetFieldInfo(MrdbCursor *self)
             {
                 self->sequence_fields[i].name= self->fields[i].name;
             }
-            self->sequence_type= PyStructSequence_NewType(&sequence_desc);
+            (void)PyStructSequence_InitType(&self->sequence_type, &sequence_desc);
         }
     }
     return 0;
@@ -1181,7 +1180,7 @@ mariadb_get_sequence_or_tuple(MrdbCursor *self)
     switch (self->result_format)
     {
         case RESULT_NAMED_TUPLE:
-            return PyStructSequence_New(self->sequence_type);
+            return PyStructSequence_New(&self->sequence_type);
         case RESULT_DICTIONARY:
             return PyDict_New();
         default: