Skip to content

bpo-40956: Convert _sqlite3.Connection to Argument Clinic, part 2 #23838

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
corona10 merged 4 commits into from
Dec 27, 2020
Merged

bpo-40956: Convert _sqlite3.Connection to Argument Clinic, part 2 #23838

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b4e11a
Convert _sqlite3.Connection to Argument Clinic, part 2
Nov 17, 2020
998a92d
Address review: add missing docstrings
Dec 26, 2020
d1b5e28
Address review: sqlite3.Connection.execute() takes no keyword arguments
Dec 26, 2020
de21ba1
Update clinic
Dec 26, 2020
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
Prev Previous commit
Update clinic
  • Loading branch information
Erlend E. Aasland committed Dec 26, 2020
commit de21ba1852843b63a3fa6045a04626e374a98b2d
21 changes: 8 additions & 13 deletions Modules/_sqlite/clinic/connection.c.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,31 +392,26 @@ pysqlite_connection_load_extension(pysqlite_Connection *self, PyObject *arg)
#endif /* !defined(SQLITE_OMIT_LOAD_EXTENSION) */

PyDoc_STRVAR(pysqlite_connection_execute__doc__,
"execute($self, sql, /, parameters=<unrepresentable>)\n"
"execute($self, sql, parameters=<unrepresentable>, /)\n"
"--\n"
"\n"
"Executes a SQL statement. Non-standard.");

#define PYSQLITE_CONNECTION_EXECUTE_METHODDEF \
{"execute", (PyCFunction)(void(*)(void))pysqlite_connection_execute, METH_FASTCALL|METH_KEYWORDS, pysqlite_connection_execute__doc__},
{"execute", (PyCFunction)(void(*)(void))pysqlite_connection_execute, METH_FASTCALL, pysqlite_connection_execute__doc__},

static PyObject *
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, PyObject *kwnames)
pysqlite_connection_execute(pysqlite_Connection *self, PyObject *const *args, Py_ssize_t nargs)
{
PyObject *return_value = NULL;
static const char * const _keywords[] = {"", "parameters", NULL};
static _PyArg_Parser _parser = {NULL, _keywords, "execute", 0};
PyObject *argsbuf[2];
Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 1;
PyObject *sql;
PyObject *parameters = NULL;

args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 2, 0, argsbuf);
if (!args) {
if (!_PyArg_CheckPositional("execute", nargs, 1, 2)) {
goto exit;
}
if (!PyUnicode_Check(args[0])) {
Expand All @@ -427,11 +422,11 @@ pysqlite_connection_execute(pysqlite_Connection *self, PyObject *const *args, Py
goto exit;
}
sql = args[0];
if (!noptargs) {
goto skip_optional_pos;
if (nargs < 2) {
goto skip_optional;
}
parameters = args[1];
skip_optional_pos:
skip_optional:
return_value = pysqlite_connection_execute_impl(self, sql, parameters);

exit:
Expand Down Expand Up @@ -724,4 +719,4 @@ pysqlite_connection_exit(pysqlite_Connection *self, PyObject *const *args, Py_ss
#ifndef PYSQLITE_CONNECTION_LOAD_EXTENSION_METHODDEF
#define PYSQLITE_CONNECTION_LOAD_EXTENSION_METHODDEF
#endif /* !defined(PYSQLITE_CONNECTION_LOAD_EXTENSION_METHODDEF) */
/*[clinic end generated code: output=d8f2ae5034cface4 input=a9049054013a1b77]*/
/*[clinic end generated code: output=7cb13d491a5970aa input=a9049054013a1b77]*/
2 changes: 1 addition & 1 deletion Modules/_sqlite/connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1360,7 +1360,7 @@ Executes a SQL statement. Non-standard.
static PyObject *
pysqlite_connection_execute_impl(pysqlite_Connection *self, PyObject *sql,
PyObject *parameters)
/*[clinic end generated code: output=5be05ae01ee17ee4 input=ec86c00fe1b371be]*/
/*[clinic end generated code: output=5be05ae01ee17ee4 input=fbd17c75c7140271]*/
{
_Py_IDENTIFIER(execute);
PyObject* cursor = 0;
Expand Down