diff options
| author | Brett Cannon <brett@python.org> | 2013-07-04 21:43:24 (GMT) |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2013-07-04 21:43:24 (GMT) |
| commit | cd171c8e92c10d327151400fd8f16b11a4964615 (patch) | |
| tree | db734100511572201a54a6b7ce1803bcea4c94da /Lib/encodings | |
| parent | fff59155d40ede93594eb77f320e0bde658cce28 (diff) | |
| download | cpython-cd171c8e92c10d327151400fd8f16b11a4964615.zip cpython-cd171c8e92c10d327151400fd8f16b11a4964615.tar.gz cpython-cd171c8e92c10d327151400fd8f16b11a4964615.tar.bz2 | |
Issue #18200: Back out usage of ModuleNotFoundError (8d28d44f3a9a)
Diffstat (limited to 'Lib/encodings')
| -rw-r--r-- | Lib/encodings/__init__.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/encodings/__init__.py b/Lib/encodings/__init__.py index 10d881d..8dd7130 100644 --- a/Lib/encodings/__init__.py +++ b/Lib/encodings/__init__.py @@ -29,11 +29,11 @@ Written by Marc-Andre Lemburg (mal@lemburg.com). """#" import codecs -import importlib from . import aliases _cache = {} _unknown = '--unknown--' +_import_tail = ['*'] _aliases = aliases.aliases class CodecRegistryError(LookupError, SystemError): @@ -94,8 +94,9 @@ def search_function(encoding): try: # Import is absolute to prevent the possibly malicious import of a # module with side-effects that is not in the 'encodings' package. - mod = importlib.import_module('encodings.' + modname) - except ModuleNotFoundError: + mod = __import__('encodings.' + modname, fromlist=_import_tail, + level=0) + except ImportError: pass else: break |