summaryrefslogtreecommitdiff
path: root/Python
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-01-18 22:30:21 +0100
committerAntoine Pitrou <solipsis@pitrou.net>2012-01-18 22:30:21 +0100
commitcc0f5885dbb9226e53e449d6623df53fa75b66ce (patch)
tree4445449b1b3b44f2200d51de227c193613a374f7 /Python
parentc366f5fe519ed59f4268b7b005fd459d1f4ca181 (diff)
downloadcpython-cc0f5885dbb9226e53e449d6623df53fa75b66ce.tar.gz
Issue #13722: Avoid silencing ImportErrors when initializing the codecs registry.
Diffstat (limited to 'Python')
-rw-r--r--Python/codecs.c9
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);