diff options
| author | Matti Picus <matti.picus@gmail.com> | 2020-01-15 08:32:24 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-15 08:32:24 +1100 |
| commit | 674d96ef3da8e9b97b29acaefea432d2524f0ca4 (patch) | |
| tree | 71009f4eeed85a8b27dd50a59635737dde7ea5e9 /numpy/f2py/src/fortranobject.c | |
| parent | 558080ef33de051c52bd1214c372380680cb6800 (diff) | |
| parent | e2921434a07c22714bbf242be5389c3056449863 (diff) | |
| download | numpy-674d96ef3da8e9b97b29acaefea432d2524f0ca4.tar.gz | |
Merge pull request #15262 from eric-wieser/use-PyDict_GetItemWithError
BUG: Use PyDict_GetItemWithError() instead of PyDict_GetItem()
Diffstat (limited to 'numpy/f2py/src/fortranobject.c')
| -rw-r--r-- | numpy/f2py/src/fortranobject.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/numpy/f2py/src/fortranobject.c b/numpy/f2py/src/fortranobject.c index 8ec5b510f..644339218 100644 --- a/numpy/f2py/src/fortranobject.c +++ b/numpy/f2py/src/fortranobject.c @@ -260,8 +260,11 @@ static PyObject * fortran_getattr(PyFortranObject *fp, char *name) { int i,j,k,flag; if (fp->dict != NULL) { - PyObject *v = PyDict_GetItemString(fp->dict, name); - if (v != NULL) { + PyObject *v = _PyDict_GetItemStringWithError(fp->dict, name); + if (v == NULL && PyErr_Occurred()) { + return NULL; + } + else if (v != NULL) { Py_INCREF(v); return v; } |