Skip to content

bpo-32787: Better error handling in ctypes. #3727

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 11 commits into from
Dec 5, 2018
Merged

bpo-32787: Better error handling in ctypes. #3727

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4c77e8b
bpo-31572: Get rid of PyObject_HasAttrString() in ctypes.
serhiy-storchaka Sep 24, 2017
de995da
Merge branch 'master' into ctypes-no-hasattr
serhiy-storchaka Nov 11, 2017
ed1fb01
Fix error handling for _pack_.
serhiy-storchaka Nov 11, 2017
70d31ba
Don't silence errors when look up in a dict.
serhiy-storchaka Nov 11, 2017
f8b64f1
Merge branch 'master' into ctypes-no-hasattr
serhiy-storchaka Jan 16, 2018
34c40e0
Merge branch 'master' into ctypes-no-hasattr
serhiy-storchaka Feb 1, 2018
e10a467
Use _PyObject_LookupAttrId().
serhiy-storchaka Feb 1, 2018
d7bb65a
More changes.
serhiy-storchaka Feb 7, 2018
149d4b9
Merge branch 'master' into ctypes-no-hasattr
serhiy-storchaka Feb 7, 2018
423ac29
Merge branch 'master' into ctypes-no-hasattr
serhiy-storchaka Sep 22, 2018
4cf77fe
Merge branch 'master' into ctypes-no-hasattr
serhiy-storchaka Dec 4, 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
Use _PyObject_LookupAttrId().
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Feb 1, 2018
commit e10a467028361a71ff0b06fff86217cc42ae4fb6
10 changes: 4 additions & 6 deletions Modules/_ctypes/_ctypes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2342,12 +2342,10 @@ make_funcptrtype_dict(StgDictObject *stgdict)
}
Py_INCREF(ob);
stgdict->restype = ob;
stgdict->checker = _PyObject_GetAttrId(ob, &PyId__check_retval_);
if (stgdict->checker == NULL) {
if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
return -1;
}
PyErr_Clear();
if (_PyObject_LookupAttrId(ob, &PyId__check_retval_,
&stgdict->checker) < 0)
{
return -1;
}
}
else if (PyErr_Occurred()) {
Expand Down