Skip to content

bpo-32788: Better error handling in sqlite3. #3723

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
serhiy-storchaka merged 13 commits into from
Dec 10, 2018
Merged

bpo-32788: Better error handling in sqlite3. #3723

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e2a3c02
bpo-31572: Get rid of PyDict_GetItem() and PyObject_HasAttrString() i…
serhiy-storchaka Sep 24, 2017
423748a
Fix a refcount error.
serhiy-storchaka Sep 24, 2017
4305fb7
Fixed more suppressed errors.
serhiy-storchaka Sep 25, 2017
f102d23
Merge branch 'master' into sqlite-no-hasattr
serhiy-storchaka Jan 16, 2018
c989ed9
Merge branch 'master' into sqlite-no-hasattr
serhiy-storchaka Feb 1, 2018
dafc64d
Use _PyObject_LookupAttrId().
serhiy-storchaka Feb 1, 2018
929d5b5
Merge branch 'master' into sqlite-no-hasattr
serhiy-storchaka Feb 7, 2018
1c094a4
Merge branch 'master' into sqlite-no-hasattr
serhiy-storchaka Jul 8, 2018
4585ae8
Minor refactoring.
serhiy-storchaka Jul 8, 2018
87f5945
Merge branch 'master' into sqlite-no-hasattr
serhiy-storchaka Jul 22, 2018
369164a
Keep the old formatting.
serhiy-storchaka Jul 23, 2018
c5bc2a6
Add tests and a news entry.
serhiy-storchaka Jul 23, 2018
e7e4112
Merge branch 'master' into sqlite-no-hasattr
serhiy-storchaka Sep 23, 2018
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
Fix a refcount error.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Sep 24, 2017
commit 423748ae46c24351caeb9e3fd470de606e70f90c
9 changes: 5 additions & 4 deletions Modules/_sqlite/microprotocols.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ pysqlite_microprotocols_adapt(PyObject *obj, PyObject *proto, PyObject *alt)
{
_Py_IDENTIFIER(__adapt__);
_Py_IDENTIFIER(__conform__);
PyObject *adapter, *key;
PyObject *adapter, *key, *adapted;

/* we don't check for exact type conformance as specified in PEP 246
because the pysqlite_PrepareProtocolType type is abstract and there is no
Expand All @@ -91,7 +91,8 @@ pysqlite_microprotocols_adapt(PyObject *obj, PyObject *proto, PyObject *alt)
adapter = PyDict_GetItemWithError(psyco_adapters, key);
Py_DECREF(key);
if (adapter) {
PyObject *adapted = PyObject_CallFunctionObjArgs(adapter, obj, NULL);
Py_INCREF(adapter);
adapted = PyObject_CallFunctionObjArgs(adapter, obj, NULL);
Py_DECREF(adapter);
return adapted;
}
Expand All @@ -102,7 +103,7 @@ pysqlite_microprotocols_adapt(PyObject *obj, PyObject *proto, PyObject *alt)
/* try to have the protocol adapt this object */
adapter = _PyObject_GetAttrId(proto, &PyId___adapt__);
if (adapter) {
PyObject *adapted = PyObject_CallFunctionObjArgs(adapter, obj, NULL);
adapted = PyObject_CallFunctionObjArgs(adapter, obj, NULL);
Py_DECREF(adapter);

if (adapted == Py_None) {
Expand All @@ -128,7 +129,7 @@ pysqlite_microprotocols_adapt(PyObject *obj, PyObject *proto, PyObject *alt)
/* and finally try to have the object adapt itself */
adapter = _PyObject_GetAttrId(obj, &PyId___conform__);
if (adapter) {
PyObject *adapted = PyObject_CallFunctionObjArgs(adapter, proto, NULL);
adapted = PyObject_CallFunctionObjArgs(adapter, proto, NULL);
Py_DECREF(adapter);

if (adapted == Py_None) {
Expand Down