Address review

Erlend E. Aasland · Erlend E. Aasland · commit 3d1616af8feb · 2021-01-13T22:25:45.000+01:00
diff --git a/Modules/_sqlite/clinic/cursor.c.h b/Modules/_sqlite/clinic/cursor.c.h
@@ -141,13 +141,16 @@ PyDoc_STRVAR(pysqlite_cursor_fetchmany__doc__,
 "fetchmany($self, /, size=<unrepresentable>)\n"
 "--\n"
 "\n"
-"Fetches several rows from the resultset.");
+"Fetches several rows from the resultset.\n"
+"\n"
+"  size\n"
+"    The number of rows to fetch. Defaults to the cursor\'s arraysize.");
 
 #define PYSQLITE_CURSOR_FETCHMANY_METHODDEF    \
     {"fetchmany", (PyCFunction)(void(*)(void))pysqlite_cursor_fetchmany, METH_FASTCALL|METH_KEYWORDS, pysqlite_cursor_fetchmany__doc__},
 
 static PyObject *
-pysqlite_cursor_fetchmany_impl(pysqlite_Cursor *self, int maxrows);
+pysqlite_cursor_fetchmany_impl(pysqlite_Cursor *self, PyObject *maxrows_obj);
 
 static PyObject *
 pysqlite_cursor_fetchmany(pysqlite_Cursor *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
@@ -157,7 +160,7 @@ pysqlite_cursor_fetchmany(pysqlite_Cursor *self, PyObject *const *args, Py_ssize
     static _PyArg_Parser _parser = {NULL, _keywords, "fetchmany", 0};
     PyObject *argsbuf[1];
     Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 0;
-    int maxrows = self->arraysize;
+    PyObject *maxrows_obj = NULL;
 
     args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 0, 1, 0, argsbuf);
     if (!args) {
@@ -166,12 +169,9 @@ pysqlite_cursor_fetchmany(pysqlite_Cursor *self, PyObject *const *args, Py_ssize
     if (!noptargs) {
         goto skip_optional_pos;
     }
-    maxrows = _PyLong_AsInt(args[0]);
-    if (maxrows == -1 && PyErr_Occurred()) {
-        goto exit;
-    }
+    maxrows_obj = args[0];
 skip_optional_pos:
-    return_value = pysqlite_cursor_fetchmany_impl(self, maxrows);
+    return_value = pysqlite_cursor_fetchmany_impl(self, maxrows_obj);
 
 exit:
     return return_value;
@@ -256,4 +256,4 @@ pysqlite_cursor_close(pysqlite_Cursor *self, PyObject *Py_UNUSED(ignored))
 {
     return pysqlite_cursor_close_impl(self);
 }
-/*[clinic end generated code: output=8b5ffd9029d33cd8 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=53cab2e724cd2ba5 input=a9049054013a1b77]*/
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
@@ -822,18 +822,26 @@ pysqlite_cursor_fetchone_impl(pysqlite_Cursor *self)
 /*[clinic input]
 _sqlite3.Cursor.fetchmany as pysqlite_cursor_fetchmany
 
-    size as maxrows: int(c_default='self->arraysize', py_default='<unrepresentable>') = 1
+    size as maxrows_obj: object = NULL
+        The number of rows to fetch. Defaults to the cursor's arraysize.
 
 Fetches several rows from the resultset.
 [clinic start generated code]*/
 
 static PyObject *
-pysqlite_cursor_fetchmany_impl(pysqlite_Cursor *self, int maxrows)
-/*[clinic end generated code: output=a8ef31fea64d0906 input=e436f4f150e78b9b]*/
+pysqlite_cursor_fetchmany_impl(pysqlite_Cursor *self, PyObject *maxrows_obj)
+/*[clinic end generated code: output=91a37190dafbc2de input=d8c699ff7e0db461]*/
 {
     PyObject* row;
     PyObject* list;
     int counter = 0;
+    int maxrows;
+
+    if (maxrows_obj == NULL) {
+        maxrows = self->arraysize;
+    } else if (PyLong_Check(maxrows_obj) < 0) {
+        maxrows = PyLong_AsLong(maxrows_obj);
+    }
 
     list = PyList_New(0);
     if (!list) {
