Skip to content

bpo-40956: fix sqlite3.Cursor.fetchmany() default value #24214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
berkerpeksag merged 8 commits into from
Jan 13, 2021
Merged

bpo-40956: fix sqlite3.Cursor.fetchmany() default value #24214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
68010fe
bpo-40956: fix Cursor.fetchmany() default value
Jan 13, 2021
3d1616a
Address review
Jan 13, 2021
37b8354
Revert "Address review"
Jan 13, 2021
3656707
Add argument docstring, explaining the default value
Jan 13, 2021
bd51d3f
Address review: Adjust parameter docstring wording
Jan 13, 2021
589db0b
Update clinic
Jan 13, 2021
834f890
Address review: Remove pydefault='<unrepresentable>'
Jan 13, 2021
ac00b5f
Update clinic again
Jan 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions Modules/_sqlite/clinic/cursor.c.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,13 @@ pysqlite_cursor_fetchone(pysqlite_Cursor *self, PyObject *Py_UNUSED(ignored))
}

PyDoc_STRVAR(pysqlite_cursor_fetchmany__doc__,
"fetchmany($self, /, size=cursor.arraysize)\n"
"fetchmany($self, /, size=1)\n"
"--\n"
"\n"
"Fetches several rows from the resultset.");
"Fetches several rows from the resultset.\n"
"\n"
" size\n"
" The default value is set by the Cursor.arraysize attribute.");

#define PYSQLITE_CURSOR_FETCHMANY_METHODDEF \
{"fetchmany", (PyCFunction)(void(*)(void))pysqlite_cursor_fetchmany, METH_FASTCALL|METH_KEYWORDS, pysqlite_cursor_fetchmany__doc__},
Expand Down Expand Up @@ -256,4 +259,4 @@ pysqlite_cursor_close(pysqlite_Cursor *self, PyObject *Py_UNUSED(ignored))
{
return pysqlite_cursor_close_impl(self);
}
/*[clinic end generated code: output=11db0de4fb1951a9 input=a9049054013a1b77]*/
/*[clinic end generated code: output=6a2d4d49784aa686 input=a9049054013a1b77]*/
5 changes: 3 additions & 2 deletions Modules/_sqlite/cursor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,14 +822,15 @@ pysqlite_cursor_fetchone_impl(pysqlite_Cursor *self)
/*[clinic input]
_sqlite3.Cursor.fetchmany as pysqlite_cursor_fetchmany

size as maxrows: int(c_default='self->arraysize') = cursor.arraysize
size as maxrows: int(c_default='self->arraysize') = 1
The default value is set by the Cursor.arraysize attribute.

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=d80ff999a7701ffb]*/
/*[clinic end generated code: output=a8ef31fea64d0906 input=c26e6ca3f34debd0]*/
{
PyObject* row;
PyObject* list;
Expand Down