Use PyType_GenericNew everywhere

Any non-zero initialization is done in the _init methods.

This also allowed removing some code which is nice.

Refs #498

Author: rogerbinns

src/backup.c

@@ -399,5 +399,5 @@ static PyTypeObject APSWBackupType = {
   .tp_methods = backup_methods,
   .tp_members = backup_members,
   .tp_getset = backup_getset,
-  .tp_str = (reprfunc)APSWBackup_tp_str,
+  .tp_str = APSWBackup_tp_str,
 };

src/blob.c

@@ -42,19 +42,6 @@ There are `benchmarks <https://www.sqlite.org/fasterthanfs.html>`__.
 
 /* ZeroBlobBind is defined in apsw.c because of forward references */
 
-static PyObject *
-ZeroBlobBind_new(PyTypeObject *type, PyObject *Py_UNUSED(args), PyObject *Py_UNUSED(kwargs))
-{
-  ZeroBlobBind *self;
-  self = (ZeroBlobBind *)type->tp_alloc(type, 0);
-  if (self)
-  {
-    self->blobsize = 0;
-    self->init_was_called = 0;
-  }
-  return (PyObject *)self;
-}
-
 /** .. method:: __init__(size: int)
 
   :param size: Number of zeroed bytes to create
@@ -110,9 +97,9 @@ static PyTypeObject ZeroBlobBindType = {
   .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
   .tp_doc = Zeroblob_class_DOC,
   .tp_methods = ZeroBlobBind_methods,
-  .tp_init = (initproc)ZeroBlobBind_init,
-  .tp_new = ZeroBlobBind_new,
-  .tp_str = (reprfunc)ZeroBlobBind_tp_str,
+  .tp_init = ZeroBlobBind_init,
+  .tp_new = PyType_GenericNew,
+  .tp_str = ZeroBlobBind_tp_str,
 };
 
 /* BLOB TYPE */
@@ -707,5 +694,5 @@ static PyTypeObject APSWBlobType = {
   .tp_doc = Blob_class_DOC,
   .tp_weaklistoffset = offsetof(APSWBlob, weakreflist),
   .tp_methods = APSWBlob_methods,
-  .tp_str = (reprfunc)APSWBlob_tp_str,
+  .tp_str = APSWBlob_tp_str,
 };

src/connection.c

@@ -409,53 +409,6 @@ Connection_dealloc(PyObject *self_)
   Py_TpFree(self_);
 }
 
-static PyObject *
-Connection_new(PyTypeObject *type, PyObject *Py_UNUSED(args), PyObject *Py_UNUSED(kwds))
-{
-  Connection *self;
-
-  self = (Connection *)type->tp_alloc(type, 0);
-  if (self != NULL)
-  {
-    self->db = 0;
-    self->dbmutex = 0;
-    self->cursor_factory = Py_NewRef((PyObject *)&APSWCursorType);
-    self->dependents = PyList_New(0);
-    self->stmtcache = 0;
-    self->fts5_api_cached = 0;
-    self->busyhandler = 0;
-    self->rollbackhook = 0;
-    self->updatehook = 0;
-    self->commithook = 0;
-    self->walhook = 0;
-    self->authorizer = 0;
-    self->collationneeded = 0;
-    self->exectrace = 0;
-    self->rowtrace = 0;
-    self->vfs = 0;
-    self->savepointlevel = 0;
-    self->open_flags = 0;
-    self->open_vfs = 0;
-    self->weakreflist = 0;
-    self->tracehooks = PyMem_Malloc(sizeof(struct tracehook) * 1);
-    self->tracehooks_count = 0;
-    if (self->tracehooks)
-    {
-      self->tracehooks[0].callback = 0;
-      self->tracehooks[0].id = 0;
-      self->tracehooks[0].mask = 0;
-      self->tracehooks_count = 1;
-    }
-    self->progresshandler = 0;
-    self->progresshandler_count = 0;
-    CALL_TRACK_INIT(xConnect);
-    if (self->dependents && self->tracehooks)
-      return (PyObject *)self;
-  }
-
-  return NULL;
-}
-
 /** .. method:: __init__(filename: str, flags: int = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, vfs: Optional[str] = None, statementcachesize: int = 100)
 
   Opens the named database.  You can use ``:memory:`` to get a private temporary
@@ -506,6 +459,21 @@ Connection_init(PyObject *self_, PyObject *args, PyObject *kwargs)
   }
   flags |= SQLITE_OPEN_EXRESCODE;
 
+  self->cursor_factory = Py_NewRef((PyObject *)&APSWCursorType);
+  self->tracehooks = PyMem_Malloc(sizeof(struct tracehook) * 1);
+  if (!self->tracehooks)
+    return -1;
+  self->tracehooks[0].callback = 0;
+  self->tracehooks[0].id = 0;
+  self->tracehooks[0].mask = 0;
+  self->tracehooks_count = 1;
+
+  self->dependents = PyList_New(0);
+  if (!self->dependents)
+    return -1;
+
+  CALL_TRACK_INIT(xConnect);
+
   /* clamp cache size */
   if (statementcachesize < 0)
     statementcachesize = 0;
@@ -5868,15 +5836,12 @@ static PyGetSetDef Connection_getseters[] = {
   { "filename", Connection_getmainfilename, NULL, Connection_filename_DOC, NULL },
   { "filename_journal", Connection_getjournalfilename, NULL, Connection_filename_journal_DOC, NULL },
   { "filename_wal", Connection_getwalfilename, NULL, Connection_filename_wal_DOC, NULL },
-  { "cursor_factory", Connection_get_cursor_factory, Connection_set_cursor_factory,
-    Connection_cursor_factory_DOC, NULL },
+  { "cursor_factory", Connection_get_cursor_factory, Connection_set_cursor_factory, Connection_cursor_factory_DOC,
+    NULL },
   { "in_transaction", Connection_get_in_transaction, NULL, Connection_in_transaction_DOC },
-  { "exec_trace", Connection_get_exec_trace_attr, Connection_set_exec_trace_attr,
-    Connection_exec_trace_DOC },
-  { "row_trace", Connection_get_row_trace_attr, Connection_set_row_trace_attr,
-    Connection_row_trace_DOC },
-  { "authorizer", Connection_get_authorizer_attr, Connection_set_authorizer_attr,
-    Connection_authorizer_DOC },
+  { "exec_trace", Connection_get_exec_trace_attr, Connection_set_exec_trace_attr, Connection_exec_trace_DOC },
+  { "row_trace", Connection_get_row_trace_attr, Connection_set_row_trace_attr, Connection_row_trace_DOC },
+  { "authorizer", Connection_get_authorizer_attr, Connection_set_authorizer_attr, Connection_authorizer_DOC },
   { "system_errno", Connection_get_system_errno, NULL, Connection_system_errno_DOC },
   { "is_interrupted", Connection_is_interrupted, NULL, Connection_is_interrupted_DOC },
 #ifndef APSW_OMIT_OLD_NAMES
@@ -6120,7 +6085,7 @@ static PyTypeObject ConnectionType = {
   .tp_methods = Connection_methods,
   .tp_members = Connection_members,
   .tp_getset = Connection_getseters,
-  .tp_init = (initproc)Connection_init,
-  .tp_new = Connection_new,
-  .tp_str = (reprfunc)Connection_tp_str,
+  .tp_init = Connection_init,
+  .tp_new = PyType_GenericNew,
+  .tp_str = Connection_tp_str,
 };

src/cursor.c

@@ -87,9 +87,9 @@ struct APSWCursor
   /* what state we are in */
   enum
   {
+    C_DONE = 0,
     C_BEGIN,
     C_ROW,
-    C_DONE
   } status;
 };
 
@@ -265,34 +265,6 @@ APSWCursor_dealloc(PyObject *self_)
   Py_TpFree(self_);
 }
 
-static PyObject *
-APSWCursor_new(PyTypeObject *type, PyObject *Py_UNUSED(args), PyObject *Py_UNUSED(kwds))
-{
-  APSWCursor *self;
-
-  self = (APSWCursor *)type->tp_alloc(type, 0);
-  if (self != NULL)
-  {
-    self->connection = NULL;
-    self->statement = 0;
-    self->status = C_DONE;
-    self->bindings = 0;
-    self->bindingsoffset = 0;
-    self->emiter = 0;
-    self->emoriginalquery = 0;
-    self->exectrace = 0;
-    self->rowtrace = 0;
-    self->weakreflist = NULL;
-    self->description_cache[0] = 0;
-    self->description_cache[1] = 0;
-    self->description_cache[2] = 0;
-    self->init_was_called = 0;
-    self->in_query = 0;
-  }
-
-  return (PyObject *)self;
-}
-
 /** .. method:: __init__(connection: Connection)
 
  Use :meth:`Connection.cursor` to make a new cursor.
@@ -1961,9 +1933,9 @@ static PyTypeObject APSWCursorType = {
   .tp_iternext = (iternextfunc)APSWCursor_next,
   .tp_methods = APSWCursor_methods,
   .tp_getset = APSWCursor_getset,
-  .tp_init = (initproc)APSWCursor_init,
-  .tp_new = APSWCursor_new,
-  .tp_str = (reprfunc)APSWCursor_tp_str,
+  .tp_init = APSWCursor_init,
+  .tp_new = PyType_GenericNew,
+  .tp_str = APSWCursor_tp_str,
 };
 
 static int
@@ -1991,7 +1963,7 @@ static PyTypeObject PyObjectBindType = {
   PyVarObject_HEAD_INIT(NULL, 0).tp_name = "apsw.pyobject",
   .tp_basicsize = sizeof(PyObjectBind),
   .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
-  .tp_init = (initproc)PyObjectBind_init,
+  .tp_init = PyObjectBind_init,
   .tp_finalize = PyObjectBind_finalize,
   .tp_new = PyType_GenericNew,
   .tp_doc = Apsw_pyobject_DOC,

src/fts.c

@@ -380,7 +380,7 @@ static PyTypeObject APSWFTS5TokenizerType = {
   .tp_call = PyVectorcall_Call,
   .tp_vectorcall_offset = offsetof(APSWFTS5Tokenizer, vectorcall),
   .tp_getset = APSWFTS5Tokenizer_getset,
-  .tp_str = (reprfunc)APSWFTS5Tokenizer_tp_str,
+  .tp_str = APSWFTS5Tokenizer_tp_str,
 };
 
 typedef struct

src/session.c

@@ -2284,7 +2284,7 @@ static PyTypeObject APSWSessionType = {
   .tp_basicsize = sizeof(APSWSession),
   .tp_doc = Session_class_DOC,
   .tp_new = PyType_GenericNew,
-  .tp_init = (initproc)APSWSession_init,
+  .tp_init = APSWSession_init,
   .tp_dealloc = APSWSession_dealloc,
   .tp_methods = APSWSession_methods,
   .tp_getset = APSWSession_getset,
@@ -2334,7 +2334,7 @@ static PyTypeObject APSWChangesetBuilderType = {
   .tp_basicsize = sizeof(APSWChangesetBuilder),
   .tp_methods = APSWChangesetBuilder_methods,
   .tp_new = PyType_GenericNew,
-  .tp_init = (initproc)APSWChangesetBuilder_init,
+  .tp_init = APSWChangesetBuilder_init,
   .tp_dealloc = APSWChangesetBuilder_dealloc,
   .tp_doc = ChangesetBuilder_class_DOC,
   .tp_weaklistoffset = offsetof(APSWChangesetBuilder, weakreflist),
@@ -2360,7 +2360,7 @@ static PyTypeObject APSWTableChangeType = {
   .tp_getset = APSWTableChange_getset,
   .tp_doc = TableChange_class_DOC,
   .tp_dealloc = APSWTableChange_dealloc,
-  .tp_str = (reprfunc)APSWTableChange_tp_str,
+  .tp_str = APSWTableChange_tp_str,
 };
 
 static PyMethodDef APSWRebaser_methods[] = {
@@ -2377,6 +2377,6 @@ static PyTypeObject APSWRebaserType = {
   .tp_doc = Rebaser_class_DOC,
   .tp_methods = APSWRebaser_methods,
   .tp_new = PyType_GenericNew,
-  .tp_init = (initproc)APSWRebaser_init,
+  .tp_init = APSWRebaser_init,
   .tp_dealloc = APSWRebaser_dealloc,
 };

src/vfs.c

@@ -84,18 +84,6 @@ typedef struct apswfcntl_pragma
   int init_was_called;
 } apswfcntl_pragma;
 
-static PyObject *
-apswfcntl_pragma_new(PyTypeObject *type, PyObject *Py_UNUSED(args), PyObject *Py_UNUSED(kwds))
-{
-  apswfcntl_pragma *self = (apswfcntl_pragma *)type->tp_alloc(type, 0);
-  if (self != NULL)
-  {
-    self->strings = NULL;
-    self->init_was_called = 0;
-  }
-  return (PyObject *)self;
-}
-
 /** .. method:: __init__(pointer: int)
 
 The pointer must be what your xFileControl method received.
@@ -195,8 +183,8 @@ static PyTypeObject apswfcntl_pragma_Type = {
   .tp_basicsize = sizeof(apswfcntl_pragma),
   .tp_itemsize = 0,
   .tp_flags = Py_TPFLAGS_DEFAULT,
-  .tp_new = apswfcntl_pragma_new,
-  .tp_init = (initproc)apswfcntl_pragma_init,
+  .tp_new = PyType_GenericNew,
+  .tp_init = apswfcntl_pragma_init,
   .tp_getset = apswfcntl_pragma_getsetters,
 };
 
@@ -1765,20 +1753,6 @@ APSWVFS_dealloc(PyObject *self_)
   Py_TpFree(self_);
 }
 
-static PyObject *
-APSWVFS_new(PyTypeObject *type, PyObject *Py_UNUSED(args), PyObject *Py_UNUSED(kwds))
-{
-  APSWVFS *self;
-  self = (APSWVFS *)type->tp_alloc(type, 0);
-  if (self)
-  {
-    self->basevfs = NULL;
-    self->containingvfs = NULL;
-    self->registered = 0;
-  }
-  return (PyObject *)self;
-}
-
 /** .. method:: __init__(name: str, base: Optional[str] = None, makedefault: bool = False, maxpathname: int = 1024, *, iVersion: int = 3, exclude: Optional[set[str]] = None)
 
     :param name: The name to register this vfs under.  If the name
@@ -1967,9 +1941,9 @@ static PyTypeObject APSWVFSType = {
   .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
   .tp_doc = VFS_class_DOC,
   .tp_methods = APSWVFS_methods,
-  .tp_init = (initproc)APSWVFS_init,
-  .tp_new = APSWVFS_new,
-  .tp_str = (reprfunc)APSWVFS_tp_str,
+  .tp_init = APSWVFS_init,
+  .tp_new = PyType_GenericNew,
+  .tp_str = APSWVFS_tp_str,
 };
 
 static int
@@ -2027,21 +2001,6 @@ APSWVFSFile_dealloc(PyObject *self_)
   PY_ERR_RESTORE(exc_save);
 }
 
-static PyObject *
-APSWVFSFile_new(PyTypeObject *type, PyObject *Py_UNUSED(args), PyObject *Py_UNUSED(kwds))
-{
-  APSWVFSFile *self;
-  self = (APSWVFSFile *)type->tp_alloc(type, 0);
-  if (self)
-  {
-    self->base = NULL;
-    self->filename = NULL;
-    self->free_filename = 1;
-  }
-
-  return (PyObject *)self;
-}
-
 /** .. method:: __init__(vfs: str, filename: str | URIFilename | None, flags: list[int,int])
 
     :param vfs: The vfs you want to inherit behaviour from.  You can
@@ -2099,6 +2058,7 @@ APSWVFSFile_init(PyObject *self_, PyObject *args, PyObject *kwargs)
     self->filename = apsw_strdup(text);
     if (!self->filename)
       return -1;
+    self->free_filename = 1;
   }
   else if (Py_IsNone(filename))
   {
@@ -3139,9 +3099,9 @@ static PyTypeObject APSWVFSFileType = {
   .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
   .tp_doc = VFSFile_class_DOC,
   .tp_methods = APSWVFSFile_methods,
-  .tp_init = (initproc)APSWVFSFile_init,
-  .tp_new = APSWVFSFile_new,
-  .tp_str = (reprfunc)APSWVFSFile_tp_str,
+  .tp_init = APSWVFSFile_init,
+  .tp_new = PyType_GenericNew,
+  .tp_str = APSWVFSFile_tp_str,
 };
 
 /** .. class:: URIFilename
@@ -3328,7 +3288,7 @@ static PyTypeObject APSWURIFilenameType = {
   .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
   .tp_doc = URIFilename_class_DOC,
   .tp_methods = APSWURIFilenameMethods,
-  .tp_str = (reprfunc)apswurifilename_tp_str,
+  .tp_str = apswurifilename_tp_str,
   .tp_getset = APSWURIFilename_getset,
 };