diff options
| author | Victor Stinner <vstinner@python.org> | 2020-03-07 00:54:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-07 00:54:20 +0100 |
| commit | 9e5d30cc99e34f4c3e7b2cd851de20816c9d1927 (patch) | |
| tree | 71e726c4695b9b3b0a31d7d2516ce8ee83b52721 /Python/import.c | |
| parent | 7b3c252dc7f44d4bdc4c7c82d225ebd09c78f520 (diff) | |
| download | cpython-git-9e5d30cc99e34f4c3e7b2cd851de20816c9d1927.tar.gz | |
bpo-39882: Py_FatalError() logs the function name (GH-18819)
The Py_FatalError() function is replaced with a macro which logs
automatically the name of the current function, unless the
Py_LIMITED_API macro is defined.
Changes:
* Add _Py_FatalErrorFunc() function.
* Remove the function name from the message of Py_FatalError() calls
which included the function name.
* Update tests.
Diffstat (limited to 'Python/import.c')
| -rw-r--r-- | Python/import.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Python/import.c b/Python/import.c index 392d711299..c4a19bc229 100644 --- a/Python/import.c +++ b/Python/import.c @@ -310,7 +310,7 @@ PyImport_GetModuleDict(void) { PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE(); if (interp->modules == NULL) { - Py_FatalError("PyImport_GetModuleDict: no module dictionary!"); + Py_FatalError("no module dictionary"); } return interp->modules; } @@ -982,8 +982,7 @@ PyImport_ExecCodeModuleWithPathnames(const char *name, PyObject *co, _Py_IDENTIFIER(_get_sourcefile); if (interp == NULL) { - Py_FatalError("PyImport_ExecCodeModuleWithPathnames: " - "no interpreter!"); + Py_FatalError("no interpreter!"); } external= PyObject_GetAttrString(interp->importlib, |