traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Antoine Pitrou 2012-01-18 22:31:12 +01:00
parent aa5c5c60f1 1b468af7be
commit f0ecdd2ab9
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -450,6 +450,9 @@ Core and Builtins
Library Library
------- -------
- Issue #13722: Avoid silencing ImportErrors when initializing the codecs
registry.
- Issue #13781: Fix GzipFile bug that caused an exception to be raised when - Issue #13781: Fix GzipFile bug that caused an exception to be raised when
opening for writing using a fileobj returned by os.fdopen(). opening for writing using a fileobj returned by os.fdopen().

9
Python/codecs.c
View File

@ -1041,15 +1041,6 @@ static int _PyCodecRegistry_Init(void)
mod = PyImport_ImportModuleNoBlock("encodings"); mod = PyImport_ImportModuleNoBlock("encodings");
if (mod == NULL) { 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; return -1;
} }
Py_DECREF(mod); Py_DECREF(mod);