Skip to content

bpo-1635741: sqlite3 now uses Py_NewRef and Py_XNewRef #23170

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

bpo-1635741: sqlite3 now uses Py_NewRef and Py_XNewRef #23170

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dc6486d
Use Py_NewRef and Py_XNewRef in sqlite3
Nov 5, 2020
8528bf6
Address review comment: Split nested calls
Nov 6, 2020
68e044f
Address Victor's review: Restore INCREF/XSETREF in Connection.__init__
Nov 8, 2020
dd7d4e7
Address review
Nov 23, 2020
29c93db
Merge branch 'master' into bpo-1635741/sqlite-new-ref
Dec 18, 2020
b7b4b78
Fix merge
Dec 18, 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
Address review comment: Split nested calls
  • Loading branch information
Erlend E. Aasland committed Nov 6, 2020
commit 8528bf636a08fe0ba035cd4484649ab2b7fbfd88
10 changes: 7 additions & 3 deletions Modules/_sqlite/row.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ pysqlite_row_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)

PyObject* pysqlite_row_item(pysqlite_Row* self, Py_ssize_t idx)
{
return Py_XNewRef(PyTuple_GetItem(self->data, idx));
PyObject *item = PyTuple_GetItem(self->data, idx);
return Py_XNewRef(item);
}

static int
Expand Down Expand Up @@ -113,7 +114,9 @@ PyObject* pysqlite_row_subscript(pysqlite_Row* self, PyObject* idx)
return NULL;
if (_idx < 0)
_idx += PyTuple_GET_SIZE(self->data);
return Py_XNewRef(PyTuple_GetItem(self->data, _idx));

PyObject *item = PyTuple_GetItem(self->data, _idx);
return Py_XNewRef(item);
} else if (PyUnicode_Check(idx)) {
nitems = PyTuple_Size(self->description);

Expand All @@ -127,7 +130,8 @@ PyObject* pysqlite_row_subscript(pysqlite_Row* self, PyObject* idx)
}
if (eq) {
/* found item */
return Py_XNewRef(PyTuple_GetItem(self->data, i));
PyObject *item = PyTuple_GetItem(self->data, i);
return Py_XNewRef(item);
}
}

Expand Down
9 changes: 6 additions & 3 deletions Modules/_sqlite/statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,11 @@ void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* para
}
for (i = 0; i < num_params; i++) {
if (PyTuple_CheckExact(parameters)) {
current_param = Py_NewRef(PyTuple_GET_ITEM(parameters, i));
PyObject *item = PyTuple_GET_ITEM(parameters, i);
current_param = Py_NewRef(item);
} else if (PyList_CheckExact(parameters)) {
current_param = Py_XNewRef(PyList_GetItem(parameters, i));
PyObject *item = PyList_GetItem(parameters, i);
current_param = Py_XNewRef(item);
} else {
current_param = PySequence_GetItem(parameters, i);
}
Expand Down Expand Up @@ -287,7 +289,8 @@ void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* para
return;
}
if (PyDict_CheckExact(parameters)) {
current_param = Py_XNewRef(PyDict_GetItemWithError(parameters, binding_name_obj));
PyObject *item = PyDict_GetItemWithError(parameters, binding_name_obj);
current_param = Py_XNewRef(item);
} else {
current_param = PyObject_GetItem(parameters, binding_name_obj);
}
Expand Down