diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2023-09-17 11:23:31 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-17 11:23:31 (GMT) |
| commit | add16f1a5e4013f97d33cc677dc008e8199f5b11 (patch) | |
| tree | 2c187adbae2766f942e35780950a526dfe84ff48 /Python/import.c | |
| parent | e57ecf6bbc59f999d27b125ea51b042c24a07bd9 (diff) | |
| download | cpython-add16f1a5e4013f97d33cc677dc008e8199f5b11.zip cpython-add16f1a5e4013f97d33cc677dc008e8199f5b11.tar.gz cpython-add16f1a5e4013f97d33cc677dc008e8199f5b11.tar.bz2 | |
gh-108511: Add C API functions which do not silently ignore errors (GH-109025)
Add the following functions:
* PyObject_HasAttrWithError()
* PyObject_HasAttrStringWithError()
* PyMapping_HasKeyWithError()
* PyMapping_HasKeyStringWithError()
Diffstat (limited to 'Python/import.c')
| -rw-r--r-- | Python/import.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Python/import.c b/Python/import.c index 126eb5e..9b0be02 100644 --- a/Python/import.c +++ b/Python/import.c @@ -2887,12 +2887,11 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *globals, } } else { - PyObject *path; - if (PyObject_GetOptionalAttr(mod, &_Py_ID(__path__), &path) < 0) { + int has_path = PyObject_HasAttrWithError(mod, &_Py_ID(__path__)); + if (has_path < 0) { goto error; } - if (path) { - Py_DECREF(path); + if (has_path) { final_mod = PyObject_CallMethodObjArgs( IMPORTLIB(interp), &_Py_ID(_handle_fromlist), mod, fromlist, IMPORT_FUNC(interp), NULL); |