mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Revert #27959: ImportError within an encoding module should also skip the encoding

Browse source
This commit is contained in:
Steve Dower 2016-09-09 08:56:37 -07:00
parent 722b685dc1
commit 18591e4189
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/encodings/__init__.py
View file

@ -98,9 +98,10 @@ def search_function(encoding):
# module with side-effects that is not in the 'encodings' package.
mod = __import__('encodings.' + modname, fromlist=_import_tail,
level=0)
except ModuleNotFoundError as ex:
if ex.name != 'encodings.' + modname:
raise
except ImportError:
# ImportError may occur because 'encodings.(modname)' does not exist,
# or because it imports a name that does not exist (see mbcs and oem)
pass
else:
break
else: