Skip to content

Commit 935140d

Browse files
author
Erlend E. Aasland
committed
The sizes argument of setinputsizes() is not optional, according to PEP 249
1 parent 64b9c36 commit 935140d

File tree

2 files changed

+6
-29
lines changed

2 files changed

+6
-29
lines changed

Modules/_sqlite/clinic/cursor.c.h

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -196,36 +196,13 @@ pysqlite_cursor_fetchall(pysqlite_Cursor *self, PyObject *Py_UNUSED(ignored))
196196
}
197197

198198
PyDoc_STRVAR(pysqlite_cursor_setinputsizes__doc__,
199-
"setinputsizes($self, sizes=None, /)\n"
199+
"setinputsizes($self, sizes, /)\n"
200200
"--\n"
201201
"\n"
202202
"Required by DB-API. Does nothing in pysqlite.");
203203

204204
#define PYSQLITE_CURSOR_SETINPUTSIZES_METHODDEF \
205-
{"setinputsizes", (PyCFunction)(void(*)(void))pysqlite_cursor_setinputsizes, METH_FASTCALL, pysqlite_cursor_setinputsizes__doc__},
206-
207-
static PyObject *
208-
pysqlite_cursor_setinputsizes_impl(pysqlite_Cursor *self, PyObject *sizes);
209-
210-
static PyObject *
211-
pysqlite_cursor_setinputsizes(pysqlite_Cursor *self, PyObject *const *args, Py_ssize_t nargs)
212-
{
213-
PyObject *return_value = NULL;
214-
PyObject *sizes = Py_None;
215-
216-
if (!_PyArg_CheckPositional("setinputsizes", nargs, 0, 1)) {
217-
goto exit;
218-
}
219-
if (nargs < 1) {
220-
goto skip_optional;
221-
}
222-
sizes = args[0];
223-
skip_optional:
224-
return_value = pysqlite_cursor_setinputsizes_impl(self, sizes);
225-
226-
exit:
227-
return return_value;
228-
}
205+
{"setinputsizes", (PyCFunction)pysqlite_cursor_setinputsizes, METH_O, pysqlite_cursor_setinputsizes__doc__},
229206

230207
PyDoc_STRVAR(pysqlite_cursor_setoutputsize__doc__,
231208
"setoutputsize($self, size, column=None, /)\n"
@@ -279,4 +256,4 @@ pysqlite_cursor_close(pysqlite_Cursor *self, PyObject *Py_UNUSED(ignored))
279256
{
280257
return pysqlite_cursor_close_impl(self);
281258
}
282-
/*[clinic end generated code: output=99f4f8ae754cf21c input=a9049054013a1b77]*/
259+
/*[clinic end generated code: output=76e0ac8ad72a5d6c input=a9049054013a1b77]*/

Modules/_sqlite/cursor.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -891,15 +891,15 @@ pysqlite_cursor_fetchall_impl(pysqlite_Cursor *self)
891891
/*[clinic input]
892892
_sqlite3.Cursor.setinputsizes as pysqlite_cursor_setinputsizes
893893
894-
sizes: object = None
894+
sizes: object
895895
/
896896
897897
Required by DB-API. Does nothing in pysqlite.
898898
[clinic start generated code]*/
899899

900900
static PyObject *
901-
pysqlite_cursor_setinputsizes_impl(pysqlite_Cursor *self, PyObject *sizes)
902-
/*[clinic end generated code: output=a06c12790bd05f2e input=d058d07e828431de]*/
901+
pysqlite_cursor_setinputsizes(pysqlite_Cursor *self, PyObject *sizes)
902+
/*[clinic end generated code: output=893c817afe9d08ad input=7cffbb168663bc69]*/
903903
{
904904
Py_RETURN_NONE;
905905
}

0 commit comments

Comments
 (0)