mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #10203: sqlite3.Row now truly supports sequence protocol. In particulr

Browse source 
it supports reverse() and negative indices.  Original patch by Claudiu Popa.
This commit is contained in:
Serhiy Storchaka 2014-05-28 12:58:34 +03:00
parent 432810f9f3
commit 47a981337a
4 changed files with 50 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Modules/_sqlite/row.c
View file

@ -63,9 +63,16 @@ int pysqlite_row_init(pysqlite_Row* self, PyObject* args, PyObject* kwargs)
return 0;
}
PyObject* pysqlite_row_item(pysqlite_Row* self, Py_ssize_t idx)
{
PyObject* item = PyTuple_GetItem(self->data, idx);
Py_XINCREF(item);
return item;
}
PyObject* pysqlite_row_subscript(pysqlite_Row* self, PyObject* idx)
{
long _idx;
Py_ssize_t _idx;
char* key;
Py_ssize_t nitems, i;
char* compare_key;
@ -76,7 +83,11 @@ PyObject* pysqlite_row_subscript(pysqlite_Row* self, PyObject* idx)
PyObject* item;
if (PyLong_Check(idx)) {
_idx = PyLong_AsLong(idx);
_idx = PyNumber_AsSsize_t(idx, PyExc_IndexError);
if (_idx == -1 && PyErr_Occurred())
return NULL;
if (_idx < 0)
_idx += PyTuple_GET_SIZE(self->data);
item = PyTuple_GetItem(self->data, _idx);
Py_XINCREF(item);
return item;
@ -198,6 +209,14 @@ PyMappingMethods pysqlite_row_as_mapping = {
/* mp_ass_subscript */ (objobjargproc)0,
};
static PySequenceMethods pysqlite_row_as_sequence = {
/* sq_length */ (lenfunc)pysqlite_row_length,
/* sq_concat */ 0,
/* sq_repeat */ 0,
/* sq_item */ (ssizeargfunc)pysqlite_row_item,
};
static PyMethodDef pysqlite_row_methods[] = {
{"keys", (PyCFunction)pysqlite_row_keys, METH_NOARGS,
PyDoc_STR("Returns the keys of the row.")},
@ -251,5 +270,6 @@ extern int pysqlite_row_setup_types(void)
{
pysqlite_RowType.tp_new = PyType_GenericNew;
pysqlite_RowType.tp_as_mapping = &pysqlite_row_as_mapping;
pysqlite_RowType.tp_as_sequence = &pysqlite_row_as_sequence;
return PyType_Ready(&pysqlite_RowType);
}