Browse Source

Issue #13722: Avoid silencing ImportErrors when initializing the codecs registry.

pull/2332/head
Antoine Pitrou 14 years ago
parent
commit
f0ecdd2ab9
  1. 3
      Misc/NEWS
  2. 9
      Python/codecs.c

3
Misc/NEWS

@ -450,6 +450,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().

9
Python/codecs.c

@ -1041,15 +1041,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);

Loading…
Cancel
Save