diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2012-01-18 22:30:21 +0100 |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-01-18 22:30:21 +0100 |
commit | 1b468af7be7a2f0af7730c64402a38cc11413f51 (patch) | |
tree | 146fd6815882724b323d4cda36541ebc3c6292e7 /Python/codecs.c | |
parent | 55f217f22d41630543d64def03324b2eeaedbd8d (diff) | |
download | cpython-git-1b468af7be7a2f0af7730c64402a38cc11413f51.tar.gz |
Issue #13722: Avoid silencing ImportErrors when initializing the codecs registry.
Diffstat (limited to 'Python/codecs.c')
-rw-r--r-- | Python/codecs.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/Python/codecs.c b/Python/codecs.c index 1a3e45774c..c7f4a9cbc1 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); |