diff options
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Python/codecs.c | 9 |
2 files changed, 3 insertions, 9 deletions
@@ -103,6 +103,9 @@ Core and Builtins Library ------- +- Issue #13722: Avoid silencing ImportErrors when initializing the codecs + registry. + - Issue #13781: Fix GzipFile bug that caused an exception to be raised when opening for writing using a fileobj returned by os.fdopen(). diff --git a/Python/codecs.c b/Python/codecs.c index 1a3e457..c7f4a9c 100644 --- a/Python/codecs.c +++ b/Python/codecs.c @@ -1067,15 +1067,6 @@ static int _PyCodecRegistry_Init(void) mod = PyImport_ImportModuleNoBlock("encodings"); if (mod == NULL) { - if (PyErr_ExceptionMatches(PyExc_ImportError)) { - /* Ignore ImportErrors... this is done so that - distributions can disable the encodings package. Note - that other errors are not masked, e.g. SystemErrors - raised to inform the user of an error in the Python - configuration are still reported back to the user. */ - PyErr_Clear(); - return 0; - } return -1; } Py_DECREF(mod); |