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

Issue #28005: Allow ImportErrors in encoding implementation to propagate.

This commit is contained in:
Steve Dower 2016-09-07 17:27:33 -07:00
parent 8195219acb
commit ef37dfcd84
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/encodings/__init__.py
View File

@ -98,8 +98,9 @@ def search_function(encoding):
# module with side-effects that is not in the 'encodings' package. # module with side-effects that is not in the 'encodings' package.
mod = __import__('encodings.' + modname, fromlist=_import_tail, mod = __import__('encodings.' + modname, fromlist=_import_tail,
level=0) level=0)
except ImportError: except ModuleNotFoundError as ex:
pass if ex.name != 'encodings.' + modname:
raise
else: else:
break break
else: else:

2
Misc/NEWS
View File

@ -99,6 +99,8 @@ Core and Builtins
Library Library
------- -------
- Issue #28005: Allow ImportErrors in encoding implementation to propagate.
- Issue #27570: Avoid zero-length memcpy() etc calls with null source - Issue #27570: Avoid zero-length memcpy() etc calls with null source
pointers in the "ctypes" and "array" modules. pointers in the "ctypes" and "array" modules.