gh-111178: Generate correct signature for most self converters (#128447)

5 files changed, 93 insertions, 93 deletions

diff --git a/Modules/_sqlite/clinic/blob.c.h b/Modules/_sqlite/clinic/blob.c.h
index b95ba948aaf..921e7cbd7ff 100644
--- a/Modules/_sqlite/clinic/blob.c.h
+++ b/Modules/_sqlite/clinic/blob.c.h
@@ -17,9 +17,9 @@ static PyObject *
 blob_close_impl(pysqlite_Blob *self);
 
 static PyObject *
-blob_close(pysqlite_Blob *self, PyObject *Py_UNUSED(ignored))
+blob_close(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return blob_close_impl(self);
+    return blob_close_impl((pysqlite_Blob *)self);
 }
 
 PyDoc_STRVAR(blob_read__doc__,
@@ -42,7 +42,7 @@ static PyObject *
 blob_read_impl(pysqlite_Blob *self, int length);
 
 static PyObject *
-blob_read(pysqlite_Blob *self, PyObject *const *args, Py_ssize_t nargs)
+blob_read(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int length = -1;
@@ -58,7 +58,7 @@ blob_read(pysqlite_Blob *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = blob_read_impl(self, length);
+    return_value = blob_read_impl((pysqlite_Blob *)self, length);
 
 exit:
     return return_value;
@@ -80,7 +80,7 @@ static PyObject *
 blob_write_impl(pysqlite_Blob *self, Py_buffer *data);
 
 static PyObject *
-blob_write(pysqlite_Blob *self, PyObject *arg)
+blob_write(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     Py_buffer data = {NULL, NULL};
@@ -88,7 +88,7 @@ blob_write(pysqlite_Blob *self, PyObject *arg)
     if (PyObject_GetBuffer(arg, &data, PyBUF_SIMPLE) != 0) {
         goto exit;
     }
-    return_value = blob_write_impl(self, &data);
+    return_value = blob_write_impl((pysqlite_Blob *)self, &data);
 
 exit:
     /* Cleanup for data */
@@ -116,7 +116,7 @@ static PyObject *
 blob_seek_impl(pysqlite_Blob *self, int offset, int origin);
 
 static PyObject *
-blob_seek(pysqlite_Blob *self, PyObject *const *args, Py_ssize_t nargs)
+blob_seek(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int offset;
@@ -137,7 +137,7 @@ blob_seek(pysqlite_Blob *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = blob_seek_impl(self, offset, origin);
+    return_value = blob_seek_impl((pysqlite_Blob *)self, offset, origin);
 
 exit:
     return return_value;
@@ -156,9 +156,9 @@ static PyObject *
 blob_tell_impl(pysqlite_Blob *self);
 
 static PyObject *
-blob_tell(pysqlite_Blob *self, PyObject *Py_UNUSED(ignored))
+blob_tell(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return blob_tell_impl(self);
+    return blob_tell_impl((pysqlite_Blob *)self);
 }
 
 PyDoc_STRVAR(blob_enter__doc__,
@@ -174,9 +174,9 @@ static PyObject *
 blob_enter_impl(pysqlite_Blob *self);
 
 static PyObject *
-blob_enter(pysqlite_Blob *self, PyObject *Py_UNUSED(ignored))
+blob_enter(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return blob_enter_impl(self);
+    return blob_enter_impl((pysqlite_Blob *)self);
 }
 
 PyDoc_STRVAR(blob_exit__doc__,
@@ -193,7 +193,7 @@ blob_exit_impl(pysqlite_Blob *self, PyObject *type, PyObject *val,
                PyObject *tb);
 
 static PyObject *
-blob_exit(pysqlite_Blob *self, PyObject *const *args, Py_ssize_t nargs)
+blob_exit(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *type;
@@ -206,9 +206,9 @@ blob_exit(pysqlite_Blob *self, PyObject *const *args, Py_ssize_t nargs)
     type = args[0];
     val = args[1];
     tb = args[2];
-    return_value = blob_exit_impl(self, type, val, tb);
+    return_value = blob_exit_impl((pysqlite_Blob *)self, type, val, tb);
 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=31abd55660e0c5af input=a9049054013a1b77]*/
+/*[clinic end generated code: output=f03f4ba622b67ae0 input=a9049054013a1b77]*/
diff --git a/Modules/_sqlite/clinic/connection.c.h b/Modules/_sqlite/clinic/connection.c.h
index 42eb6eb2f12..82fba44eb1b 100644
--- a/Modules/_sqlite/clinic/connection.c.h
+++ b/Modules/_sqlite/clinic/connection.c.h
@@ -182,7 +182,7 @@ static PyObject *
 pysqlite_connection_cursor_impl(pysqlite_Connection *self, PyObject *factory);
 
 static PyObject *
-pysqlite_connection_cursor(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_connection_cursor(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -224,7 +224,7 @@ pysqlite_connection_cursor(pysqlite_Connection *self, PyObject *const *args, Py_
     }
     factory = args[0];
 skip_optional_pos:
-    return_value = pysqlite_connection_cursor_impl(self, factory);
+    return_value = pysqlite_connection_cursor_impl((pysqlite_Connection *)self, factory);
 
 exit:
     return return_value;
@@ -255,7 +255,7 @@ blobopen_impl(pysqlite_Connection *self, const char *table, const char *col,
               sqlite3_int64 row, int readonly, const char *name);
 
 static PyObject *
-blobopen(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+blobopen(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -351,7 +351,7 @@ blobopen(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs, PyO
         goto exit;
     }
 skip_optional_kwonly:
-    return_value = blobopen_impl(self, table, col, row, readonly, name);
+    return_value = blobopen_impl((pysqlite_Connection *)self, table, col, row, readonly, name);
 
 exit:
     return return_value;
@@ -372,9 +372,9 @@ static PyObject *
 pysqlite_connection_close_impl(pysqlite_Connection *self);
 
 static PyObject *
-pysqlite_connection_close(pysqlite_Connection *self, PyObject *Py_UNUSED(ignored))
+pysqlite_connection_close(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return pysqlite_connection_close_impl(self);
+    return pysqlite_connection_close_impl((pysqlite_Connection *)self);
 }
 
 PyDoc_STRVAR(pysqlite_connection_commit__doc__,
@@ -392,9 +392,9 @@ static PyObject *
 pysqlite_connection_commit_impl(pysqlite_Connection *self);
 
 static PyObject *
-pysqlite_connection_commit(pysqlite_Connection *self, PyObject *Py_UNUSED(ignored))
+pysqlite_connection_commit(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return pysqlite_connection_commit_impl(self);
+    return pysqlite_connection_commit_impl((pysqlite_Connection *)self);
 }
 
 PyDoc_STRVAR(pysqlite_connection_rollback__doc__,
@@ -412,9 +412,9 @@ static PyObject *
 pysqlite_connection_rollback_impl(pysqlite_Connection *self);
 
 static PyObject *
-pysqlite_connection_rollback(pysqlite_Connection *self, PyObject *Py_UNUSED(ignored))
+pysqlite_connection_rollback(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return pysqlite_connection_rollback_impl(self);
+    return pysqlite_connection_rollback_impl((pysqlite_Connection *)self);
 }
 
 PyDoc_STRVAR(pysqlite_connection_create_function__doc__,
@@ -449,7 +449,7 @@ pysqlite_connection_create_function_impl(pysqlite_Connection *self,
 #endif
 
 static PyObject *
-pysqlite_connection_create_function(pysqlite_Connection *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_connection_create_function(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -525,7 +525,7 @@ pysqlite_connection_create_function(pysqlite_Connection *self, PyTypeObject *cls
         goto exit;
     }
 skip_optional_kwonly:
-    return_value = pysqlite_connection_create_function_impl(self, cls, name, narg, func, deterministic);
+    return_value = pysqlite_connection_create_function_impl((pysqlite_Connection *)self, cls, name, narg, func, deterministic);
 
 exit:
     return return_value;
@@ -557,7 +557,7 @@ create_window_function_impl(pysqlite_Connection *self, PyTypeObject *cls,
                             PyObject *aggregate_class);
 
 static PyObject *
-create_window_function(pysqlite_Connection *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+create_window_function(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -601,7 +601,7 @@ create_window_function(pysqlite_Connection *self, PyTypeObject *cls, PyObject *c
         goto exit;
     }
     aggregate_class = args[2];
-    return_value = create_window_function_impl(self, cls, name, num_params, aggregate_class);
+    return_value = create_window_function_impl((pysqlite_Connection *)self, cls, name, num_params, aggregate_class);
 
 exit:
     return return_value;
@@ -642,7 +642,7 @@ pysqlite_connection_create_aggregate_impl(pysqlite_Connection *self,
 #endif
 
 static PyObject *
-pysqlite_connection_create_aggregate(pysqlite_Connection *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_connection_create_aggregate(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -708,7 +708,7 @@ pysqlite_connection_create_aggregate(pysqlite_Connection *self, PyTypeObject *cl
         goto exit;
     }
     aggregate_class = args[2];
-    return_value = pysqlite_connection_create_aggregate_impl(self, cls, name, n_arg, aggregate_class);
+    return_value = pysqlite_connection_create_aggregate_impl((pysqlite_Connection *)self, cls, name, n_arg, aggregate_class);
 
 exit:
     return return_value;
@@ -745,7 +745,7 @@ pysqlite_connection_set_authorizer_impl(pysqlite_Connection *self,
 #endif
 
 static PyObject *
-pysqlite_connection_set_authorizer(pysqlite_Connection *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_connection_set_authorizer(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -792,7 +792,7 @@ pysqlite_connection_set_authorizer(pysqlite_Connection *self, PyTypeObject *cls,
         }
     }
     callable = args[0];
-    return_value = pysqlite_connection_set_authorizer_impl(self, cls, callable);
+    return_value = pysqlite_connection_set_authorizer_impl((pysqlite_Connection *)self, cls, callable);
 
 exit:
     return return_value;
@@ -839,7 +839,7 @@ pysqlite_connection_set_progress_handler_impl(pysqlite_Connection *self,
 #endif
 
 static PyObject *
-pysqlite_connection_set_progress_handler(pysqlite_Connection *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_connection_set_progress_handler(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -891,7 +891,7 @@ pysqlite_connection_set_progress_handler(pysqlite_Connection *self, PyTypeObject
     if (n == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = pysqlite_connection_set_progress_handler_impl(self, cls, callable, n);
+    return_value = pysqlite_connection_set_progress_handler_impl((pysqlite_Connection *)self, cls, callable, n);
 
 exit:
     return return_value;
@@ -928,7 +928,7 @@ pysqlite_connection_set_trace_callback_impl(pysqlite_Connection *self,
 #endif
 
 static PyObject *
-pysqlite_connection_set_trace_callback(pysqlite_Connection *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_connection_set_trace_callback(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -975,7 +975,7 @@ pysqlite_connection_set_trace_callback(pysqlite_Connection *self, PyTypeObject *
         }
     }
     callable = args[0];
-    return_value = pysqlite_connection_set_trace_callback_impl(self, cls, callable);
+    return_value = pysqlite_connection_set_trace_callback_impl((pysqlite_Connection *)self, cls, callable);
 
 exit:
     return return_value;
@@ -997,7 +997,7 @@ pysqlite_connection_enable_load_extension_impl(pysqlite_Connection *self,
                                                int onoff);
 
 static PyObject *
-pysqlite_connection_enable_load_extension(pysqlite_Connection *self, PyObject *arg)
+pysqlite_connection_enable_load_extension(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     int onoff;
@@ -1006,7 +1006,7 @@ pysqlite_connection_enable_load_extension(pysqlite_Connection *self, PyObject *a
     if (onoff < 0) {
         goto exit;
     }
-    return_value = pysqlite_connection_enable_load_extension_impl(self, onoff);
+    return_value = pysqlite_connection_enable_load_extension_impl((pysqlite_Connection *)self, onoff);
 
 exit:
     return return_value;
@@ -1031,7 +1031,7 @@ pysqlite_connection_load_extension_impl(pysqlite_Connection *self,
                                         const char *entrypoint);
 
 static PyObject *
-pysqlite_connection_load_extension(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_connection_load_extension(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1104,7 +1104,7 @@ pysqlite_connection_load_extension(pysqlite_Connection *self, PyObject *const *a
         goto exit;
     }
 skip_optional_kwonly:
-    return_value = pysqlite_connection_load_extension_impl(self, extension_name, entrypoint);
+    return_value = pysqlite_connection_load_extension_impl((pysqlite_Connection *)self, extension_name, entrypoint);
 
 exit:
     return return_value;
@@ -1126,7 +1126,7 @@ pysqlite_connection_execute_impl(pysqlite_Connection *self, PyObject *sql,
                                  PyObject *parameters);
 
 static PyObject *
-pysqlite_connection_execute(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs)
+pysqlite_connection_execute(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sql;
@@ -1145,7 +1145,7 @@ pysqlite_connection_execute(pysqlite_Connection *self, PyObject *const *args, Py
     }
     parameters = args[1];
 skip_optional:
-    return_value = pysqlite_connection_execute_impl(self, sql, parameters);
+    return_value = pysqlite_connection_execute_impl((pysqlite_Connection *)self, sql, parameters);
 
 exit:
     return return_value;
@@ -1165,7 +1165,7 @@ pysqlite_connection_executemany_impl(pysqlite_Connection *self,
                                      PyObject *sql, PyObject *parameters);
 
 static PyObject *
-pysqlite_connection_executemany(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs)
+pysqlite_connection_executemany(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sql;
@@ -1180,7 +1180,7 @@ pysqlite_connection_executemany(pysqlite_Connection *self, PyObject *const *args
     }
     sql = args[0];
     parameters = args[1];
-    return_value = pysqlite_connection_executemany_impl(self, sql, parameters);
+    return_value = pysqlite_connection_executemany_impl((pysqlite_Connection *)self, sql, parameters);
 
 exit:
     return return_value;
@@ -1208,9 +1208,9 @@ static PyObject *
 pysqlite_connection_interrupt_impl(pysqlite_Connection *self);
 
 static PyObject *
-pysqlite_connection_interrupt(pysqlite_Connection *self, PyObject *Py_UNUSED(ignored))
+pysqlite_connection_interrupt(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return pysqlite_connection_interrupt_impl(self);
+    return pysqlite_connection_interrupt_impl((pysqlite_Connection *)self);
 }
 
 PyDoc_STRVAR(pysqlite_connection_iterdump__doc__,
@@ -1230,7 +1230,7 @@ pysqlite_connection_iterdump_impl(pysqlite_Connection *self,
                                   PyObject *filter);
 
 static PyObject *
-pysqlite_connection_iterdump(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_connection_iterdump(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1272,7 +1272,7 @@ pysqlite_connection_iterdump(pysqlite_Connection *self, PyObject *const *args, P
     }
     filter = args[0];
 skip_optional_kwonly:
-    return_value = pysqlite_connection_iterdump_impl(self, filter);
+    return_value = pysqlite_connection_iterdump_impl((pysqlite_Connection *)self, filter);
 
 exit:
     return return_value;
@@ -1295,7 +1295,7 @@ pysqlite_connection_backup_impl(pysqlite_Connection *self,
                                 double sleep);
 
 static PyObject *
-pysqlite_connection_backup(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_connection_backup(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1388,7 +1388,7 @@ pysqlite_connection_backup(pysqlite_Connection *self, PyObject *const *args, Py_
         }
     }
 skip_optional_kwonly:
-    return_value = pysqlite_connection_backup_impl(self, target, pages, progress, name, sleep);
+    return_value = pysqlite_connection_backup_impl((pysqlite_Connection *)self, target, pages, progress, name, sleep);
 
 exit:
     return return_value;
@@ -1410,7 +1410,7 @@ pysqlite_connection_create_collation_impl(pysqlite_Connection *self,
                                           PyObject *callable);
 
 static PyObject *
-pysqlite_connection_create_collation(pysqlite_Connection *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_connection_create_collation(PyObject *self, PyTypeObject *cls, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1449,7 +1449,7 @@ pysqlite_connection_create_collation(pysqlite_Connection *self, PyTypeObject *cl
         goto exit;
     }
     callable = args[1];
-    return_value = pysqlite_connection_create_collation_impl(self, cls, name, callable);
+    return_value = pysqlite_connection_create_collation_impl((pysqlite_Connection *)self, cls, name, callable);
 
 exit:
     return return_value;
@@ -1478,7 +1478,7 @@ static PyObject *
 serialize_impl(pysqlite_Connection *self, const char *name);
 
 static PyObject *
-serialize(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+serialize(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1532,7 +1532,7 @@ serialize(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs, Py
         goto exit;
     }
 skip_optional_kwonly:
-    return_value = serialize_impl(self, name);
+    return_value = serialize_impl((pysqlite_Connection *)self, name);
 
 exit:
     return return_value;
@@ -1568,7 +1568,7 @@ deserialize_impl(pysqlite_Connection *self, Py_buffer *data,
                  const char *name);
 
 static PyObject *
-deserialize(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+deserialize(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -1638,7 +1638,7 @@ deserialize(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs,
         goto exit;
     }
 skip_optional_kwonly:
-    return_value = deserialize_impl(self, &data, name);
+    return_value = deserialize_impl((pysqlite_Connection *)self, &data, name);
 
 exit:
     /* Cleanup for data */
@@ -1666,9 +1666,9 @@ static PyObject *
 pysqlite_connection_enter_impl(pysqlite_Connection *self);
 
 static PyObject *
-pysqlite_connection_enter(pysqlite_Connection *self, PyObject *Py_UNUSED(ignored))
+pysqlite_connection_enter(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return pysqlite_connection_enter_impl(self);
+    return pysqlite_connection_enter_impl((pysqlite_Connection *)self);
 }
 
 PyDoc_STRVAR(pysqlite_connection_exit__doc__,
@@ -1687,7 +1687,7 @@ pysqlite_connection_exit_impl(pysqlite_Connection *self, PyObject *exc_type,
                               PyObject *exc_value, PyObject *exc_tb);
 
 static PyObject *
-pysqlite_connection_exit(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs)
+pysqlite_connection_exit(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *exc_type;
@@ -1700,7 +1700,7 @@ pysqlite_connection_exit(pysqlite_Connection *self, PyObject *const *args, Py_ss
     exc_type = args[0];
     exc_value = args[1];
     exc_tb = args[2];
-    return_value = pysqlite_connection_exit_impl(self, exc_type, exc_value, exc_tb);
+    return_value = pysqlite_connection_exit_impl((pysqlite_Connection *)self, exc_type, exc_value, exc_tb);
 
 exit:
     return return_value;
@@ -1729,7 +1729,7 @@ static PyObject *
 setlimit_impl(pysqlite_Connection *self, int category, int limit);
 
 static PyObject *
-setlimit(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs)
+setlimit(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int category;
@@ -1746,7 +1746,7 @@ setlimit(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs)
     if (limit == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = setlimit_impl(self, category, limit);
+    return_value = setlimit_impl((pysqlite_Connection *)self, category, limit);
 
 exit:
     return return_value;
@@ -1768,7 +1768,7 @@ static PyObject *
 getlimit_impl(pysqlite_Connection *self, int category);
 
 static PyObject *
-getlimit(pysqlite_Connection *self, PyObject *arg)
+getlimit(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     int category;
@@ -1777,7 +1777,7 @@ getlimit(pysqlite_Connection *self, PyObject *arg)
     if (category == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    return_value = getlimit_impl(self, category);
+    return_value = getlimit_impl((pysqlite_Connection *)self, category);
 
 exit:
     return return_value;
@@ -1799,7 +1799,7 @@ static PyObject *
 setconfig_impl(pysqlite_Connection *self, int op, int enable);
 
 static PyObject *
-setconfig(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs)
+setconfig(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     int op;
@@ -1820,7 +1820,7 @@ setconfig(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = setconfig_impl(self, op, enable);
+    return_value = setconfig_impl((pysqlite_Connection *)self, op, enable);
 
 exit:
     return return_value;
@@ -1842,7 +1842,7 @@ static int
 getconfig_impl(pysqlite_Connection *self, int op);
 
 static PyObject *
-getconfig(pysqlite_Connection *self, PyObject *arg)
+getconfig(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     int op;
@@ -1852,7 +1852,7 @@ getconfig(pysqlite_Connection *self, PyObject *arg)
     if (op == -1 && PyErr_Occurred()) {
         goto exit;
     }
-    _return_value = getconfig_impl(self, op);
+    _return_value = getconfig_impl((pysqlite_Connection *)self, op);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
     }
@@ -1881,4 +1881,4 @@ exit:
 #ifndef DESERIALIZE_METHODDEF
     #define DESERIALIZE_METHODDEF
 #endif /* !defined(DESERIALIZE_METHODDEF) */
-/*[clinic end generated code: output=a8fd19301c7390cc input=a9049054013a1b77]*/
+/*[clinic end generated code: output=c59effb407b8ea4d input=a9049054013a1b77]*/
diff --git a/Modules/_sqlite/clinic/cursor.c.h b/Modules/_sqlite/clinic/cursor.c.h
index ca7823cf5ae..590e429e913 100644
--- a/Modules/_sqlite/clinic/cursor.c.h
+++ b/Modules/_sqlite/clinic/cursor.c.h
@@ -52,7 +52,7 @@ pysqlite_cursor_execute_impl(pysqlite_Cursor *self, PyObject *sql,
                              PyObject *parameters);
 
 static PyObject *
-pysqlite_cursor_execute(pysqlite_Cursor *self, PyObject *const *args, Py_ssize_t nargs)
+pysqlite_cursor_execute(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sql;
@@ -71,7 +71,7 @@ pysqlite_cursor_execute(pysqlite_Cursor *self, PyObject *const *args, Py_ssize_t
     }
     parameters = args[1];
 skip_optional:
-    return_value = pysqlite_cursor_execute_impl(self, sql, parameters);
+    return_value = pysqlite_cursor_execute_impl((pysqlite_Cursor *)self, sql, parameters);
 
 exit:
     return return_value;
@@ -91,7 +91,7 @@ pysqlite_cursor_executemany_impl(pysqlite_Cursor *self, PyObject *sql,
                                  PyObject *seq_of_parameters);
 
 static PyObject *
-pysqlite_cursor_executemany(pysqlite_Cursor *self, PyObject *const *args, Py_ssize_t nargs)
+pysqlite_cursor_executemany(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sql;
@@ -106,7 +106,7 @@ pysqlite_cursor_executemany(pysqlite_Cursor *self, PyObject *const *args, Py_ssi
     }
     sql = args[0];
     seq_of_parameters = args[1];
-    return_value = pysqlite_cursor_executemany_impl(self, sql, seq_of_parameters);
+    return_value = pysqlite_cursor_executemany_impl((pysqlite_Cursor *)self, sql, seq_of_parameters);
 
 exit:
     return return_value;
@@ -126,7 +126,7 @@ pysqlite_cursor_executescript_impl(pysqlite_Cursor *self,
                                    const char *sql_script);
 
 static PyObject *
-pysqlite_cursor_executescript(pysqlite_Cursor *self, PyObject *arg)
+pysqlite_cursor_executescript(PyObject *self, PyObject *arg)
 {
     PyObject *return_value = NULL;
     const char *sql_script;
@@ -144,7 +144,7 @@ pysqlite_cursor_executescript(pysqlite_Cursor *self, PyObject *arg)
         PyErr_SetString(PyExc_ValueError, "embedded null character");
         goto exit;
     }
-    return_value = pysqlite_cursor_executescript_impl(self, sql_script);
+    return_value = pysqlite_cursor_executescript_impl((pysqlite_Cursor *)self, sql_script);
 
 exit:
     return return_value;
@@ -163,9 +163,9 @@ static PyObject *
 pysqlite_cursor_fetchone_impl(pysqlite_Cursor *self);
 
 static PyObject *
-pysqlite_cursor_fetchone(pysqlite_Cursor *self, PyObject *Py_UNUSED(ignored))
+pysqlite_cursor_fetchone(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return pysqlite_cursor_fetchone_impl(self);
+    return pysqlite_cursor_fetchone_impl((pysqlite_Cursor *)self);
 }
 
 PyDoc_STRVAR(pysqlite_cursor_fetchmany__doc__,
@@ -184,7 +184,7 @@ static PyObject *
 pysqlite_cursor_fetchmany_impl(pysqlite_Cursor *self, int maxrows);
 
 static PyObject *
-pysqlite_cursor_fetchmany(pysqlite_Cursor *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+pysqlite_cursor_fetchmany(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
@@ -214,7 +214,7 @@ pysqlite_cursor_fetchmany(pysqlite_Cursor *self, PyObject *const *args, Py_ssize
     #undef KWTUPLE
     PyObject *argsbuf[1];
     Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 0;
-    int maxrows = self->arraysize;
+    int maxrows = ((pysqlite_Cursor *)self)->arraysize;
 
     args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser,
             /*minpos*/ 0, /*maxpos*/ 1, /*minkw*/ 0, /*varpos*/ 0, argsbuf);
@@ -229,7 +229,7 @@ pysqlite_cursor_fetchmany(pysqlite_Cursor *self, PyObject *const *args, Py_ssize
         goto exit;
     }
 skip_optional_pos:
-    return_value = pysqlite_cursor_fetchmany_impl(self, maxrows);
+    return_value = pysqlite_cursor_fetchmany_impl((pysqlite_Cursor *)self, maxrows);
 
 exit:
     return return_value;
@@ -248,9 +248,9 @@ static PyObject *
 pysqlite_cursor_fetchall_impl(pysqlite_Cursor *self);
 
 static PyObject *
-pysqlite_cursor_fetchall(pysqlite_Cursor *self, PyObject *Py_UNUSED(ignored))
+pysqlite_cursor_fetchall(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return pysqlite_cursor_fetchall_impl(self);
+    return pysqlite_cursor_fetchall_impl((pysqlite_Cursor *)self);
 }
 
 PyDoc_STRVAR(pysqlite_cursor_setinputsizes__doc__,
@@ -276,7 +276,7 @@ pysqlite_cursor_setoutputsize_impl(pysqlite_Cursor *self, PyObject *size,
                                    PyObject *column);
 
 static PyObject *
-pysqlite_cursor_setoutputsize(pysqlite_Cursor *self, PyObject *const *args, Py_ssize_t nargs)
+pysqlite_cursor_setoutputsize(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *size;
@@ -291,7 +291,7 @@ pysqlite_cursor_setoutputsize(pysqlite_Cursor *self, PyObject *const *args, Py_s
     }
     column = args[1];
 skip_optional:
-    return_value = pysqlite_cursor_setoutputsize_impl(self, size, column);
+    return_value = pysqlite_cursor_setoutputsize_impl((pysqlite_Cursor *)self, size, column);
 
 exit:
     return return_value;
@@ -310,8 +310,8 @@ static PyObject *
 pysqlite_cursor_close_impl(pysqlite_Cursor *self);
 
 static PyObject *
-pysqlite_cursor_close(pysqlite_Cursor *self, PyObject *Py_UNUSED(ignored))
+pysqlite_cursor_close(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return pysqlite_cursor_close_impl(self);
+    return pysqlite_cursor_close_impl((pysqlite_Cursor *)self);
 }
-/*[clinic end generated code: output=f0804afc5f8646c1 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=82620ca7622b547c input=a9049054013a1b77]*/
diff --git a/Modules/_sqlite/clinic/row.c.h b/Modules/_sqlite/clinic/row.c.h
index e8d1dbf2ba8..068906744e4 100644
--- a/Modules/_sqlite/clinic/row.c.h
+++ b/Modules/_sqlite/clinic/row.c.h
@@ -52,8 +52,8 @@ static PyObject *
 pysqlite_row_keys_impl(pysqlite_Row *self);
 
 static PyObject *
-pysqlite_row_keys(pysqlite_Row *self, PyObject *Py_UNUSED(ignored))
+pysqlite_row_keys(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    return pysqlite_row_keys_impl(self);
+    return pysqlite_row_keys_impl((pysqlite_Row *)self);
 }
-/*[clinic end generated code: output=788bf817acc02b8e input=a9049054013a1b77]*/
+/*[clinic end generated code: output=6c1acbb48f386468 input=a9049054013a1b77]*/
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
index 0fbd408f18c..24e97fcf189 100644
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -1155,7 +1155,7 @@ pysqlite_cursor_fetchone_impl(pysqlite_Cursor *self)
 /*[clinic input]
 _sqlite3.Cursor.fetchmany as pysqlite_cursor_fetchmany
 
-    size as maxrows: int(c_default='self->arraysize') = 1
+    size as maxrows: int(c_default='((pysqlite_Cursor *)self)->arraysize') = 1
         The default value is set by the Cursor.arraysize attribute.
 
 Fetches several rows from the resultset.
@@ -1163,7 +1163,7 @@ Fetches several rows from the resultset.
 
 static PyObject *
 pysqlite_cursor_fetchmany_impl(pysqlite_Cursor *self, int maxrows)
-/*[clinic end generated code: output=a8ef31fea64d0906 input=c26e6ca3f34debd0]*/
+/*[clinic end generated code: output=a8ef31fea64d0906 input=035dbe44a1005bf2]*/
 {
     PyObject* row;
     PyObject* list;