From 18591e418915aad9811dc1c7a064ca244fcc7f68 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Fri, 9 Sep 2016 08:56:37 -0700 Subject: Revert #27959: ImportError within an encoding module should also skip the encoding --- Lib/encodings/__init__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Lib/encodings/__init__.py b/Lib/encodings/__init__.py index cf90568..aa2fb7c 100644 --- a/Lib/encodings/__init__.py +++ b/Lib/encodings/__init__.py @@ -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: -- cgit v0.12