8000 bpo-40956: Use Argument Clinic in sqlite3 module by erlend-aasland · Pull Request #20826 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content
8000

bpo-40956: Use Argument Clinic in sqlite3 module #20826

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

Closed
wants to merge 9 commits into from
Closed

bpo-40956: Use Argument Clinic in sqlite3 module #20826

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a5906b3
Convert module level functions except connect
Jun 13, 2020
2557de5
Convert Connection
Jun 13, 2020
6e1a726
Convert Row
Jun 13, 2020
311740f
Convert Cache
Jun 13, 2020
d21accb
Convert PrepareProtocol
Jun 13, 2020
d5baf45
Convert Cursor
Jun 13, 2020
144d84a
Convert sqlite3.connect() and Connection.__init__()
Jun 14, 2020
dab5c43
Add NEWS
Jun 14, 2020
822d50f
Sync clinic with master
Sep 8, 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
Next Next commit
Convert Row
  • Loading branch information
Erlend E. Aasland committed Sep 8, 2020
commit 6e1a726985319c212fee4ceb787510d8f29d095c
56 changes: 56 additions & 0 deletions Modules/_sqlite/clinic/row.c.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/*[clinic input]
preserve
[clinic start generated code]*/

static PyObject *
pysqlite_row_new_impl(PyTypeObject *type, pysqlite_Cursor *cursor,
PyObject *data);

static PyObject *
pysqlite_row_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
{
PyObject *return_value = NULL;
pysqlite_Cursor *cursor;
PyObject *data;

if ((type == &pysqlite_RowType) &&
!_PyArg_NoKeywords("Row", kwargs)) {
goto exit;
}
if (!_PyArg_CheckPositional("Row", PyTuple_GET_SIZE(args), 2, 2)) {
goto exit;
}
if (!PyObject_TypeCheck(PyTuple_GET_ITEM(args, 0), &pysqlite_CursorType)) {
_PyArg_BadArgument("Row", "argument 1", (&pysqlite_CursorType)->tp_name, PyTuple_GET_ITEM(args, 0));
goto exit;
}
cursor = (pysqlite_Cursor *)PyTuple_GET_ITEM(args, 0);
if (!PyTuple_Check(PyTuple_GET_ITEM(args, 1))) {
_PyArg_BadArgument("Row", "argument 2", "tuple", PyTuple_GET_ITEM(args, 1));
goto exit;
}
data = PyTuple_GET_ITEM(args, 1);
return_value = pysqlite_row_new_impl(type, cursor, data);

exit:
return return_value;
}

PyDoc_STRVAR(pysqlite_row_keys__doc__,
"keys($self, /)\n"
"--\n"
"\n"
"Returns the keys of the row.");

#define PYSQLITE_ROW_KEYS_METHODDEF \
{"keys", (PyCFunction)pysqlite_row_keys, METH_NOARGS, pysqlite_row_keys__doc__},

static PyObject *
pysqlite_row_keys_impl(pysqlite_Row *self);

static PyObject *
pysqlite_row_keys(pysqlite_Row *self, PyObject *Py_UNUSED(ignored))
{
return pysqlite_row_keys_impl(self);
}
/*[clinic end generated code: output=64c70362f4bfe669 input=a9049054013a1b77]*/
51 changes: 30 additions & 21 deletions Modules/_sqlite/row.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@

#include "row.h"
#include "cursor.h"
#include "clinic/row.c.h"

/*[clinic input]
module _sqlite3
class _sqlite3.Row "pysqlite_Row *" "&pysqlite_RowType"
[clinic start generated code]*/
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=5fe72209a8a6e40c]*/

void pysqlite_row_dealloc(pysqlite_Row* self)
{
Expand All @@ -32,30 +39,25 @@ void pysqlite_row_dealloc(pysqlite_Row* self)
Py_TYPE(self)->tp_free((PyObject*)self);
}

/*[clinic input]
@classmethod
_sqlite3.Row.__new__ as pysqlite_row_new

cursor: object(type='pysqlite_Cursor *', subclass_of='&pysqlite_CursorType')
data: object(subclass_of='&PyTuple_Type')
/

[clinic start generated code]*/

static PyObject *
pysqlite_row_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
pysqlite_row_new_impl(PyTypeObject *type, pysqlite_Cursor *cursor,
PyObject *data)
/*[clinic end generated code: output=10d58b09a819a4c1 input=3bb62e4657f18d81]*/
{
pysqlite_Row *self;
PyObject* data;
pysqlite_Cursor* cursor;

assert(type != NULL && type->tp_alloc != NULL);

if (!_PyArg_NoKeywords("Row", kwargs))
return NULL;
if (!PyArg_ParseTuple(args, "OO", &cursor, &data))
return NULL;

if (!PyObject_TypeCheck((PyObject*)cursor, &pysqlite_CursorType)) {
PyErr_SetString(PyExc_TypeError, "instance of cursor required for first argument");
return NULL;
}

if (!PyTuple_Check(data)) {
PyErr_SetString(PyExc_TypeError, "tuple required for second argument");
return NULL;
}

self = (pysqlite_Row *) type->tp_alloc(type, 0);
if (self == NULL)
return NULL;
Expand Down Expand Up @@ -156,7 +158,15 @@ pysqlite_row_length(pysqlite_Row* self)
return PyTuple_GET_SIZE(self->data);
}

PyObject* pysqlite_row_keys(pysqlite_Row* self, PyObject *Py_UNUSED(ignored))
/*[clinic input]
_sqlite3.Row.keys as pysqlite_row_keys

Returns the keys of the row.
[clinic start generated code]*/

static PyObject *
pysqlite_row_keys_impl(pysqlite_Row *self)
/*[clinic end generated code: output=efe3dfb3af6edc07 input=7549a122827c5563]*/
{
PyObject* list;
Py_ssize_t nitems, i;
Expand Down Expand Up @@ -221,8 +231,7 @@ static PySequenceMethods pysqlite_row_as_sequence = {


static PyMethodDef pysqlite_row_methods[] = {
{"keys", (PyCFunction)pysqlite_row_keys, METH_NOARGS,
PyDoc_STR("Returns the keys of the row.")},
PYSQLITE_ROW_KEYS_METHODDEF
{NULL, NULL}
};

Expand Down
0