diff options
| author | Brett Cannon <brett@python.org> | 2013-06-14 00:57:26 (GMT) |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2013-06-14 00:57:26 (GMT) |
| commit | 0a140668faf18bf7f8d2ea15e57da5e2a0625292 (patch) | |
| tree | 97522129bc600a6eff09899ae7a177b5f3e980b3 /Lib/encodings | |
| parent | 9702a17a6ab90d026449dd20631a6f380d007b3d (diff) | |
| download | cpython-0a140668faf18bf7f8d2ea15e57da5e2a0625292.zip cpython-0a140668faf18bf7f8d2ea15e57da5e2a0625292.tar.gz cpython-0a140668faf18bf7f8d2ea15e57da5e2a0625292.tar.bz2 | |
Issue #18200: Update the stdlib (except tests) to use
ModuleNotFoundError.
Diffstat (limited to 'Lib/encodings')
| -rw-r--r-- | Lib/encodings/__init__.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Lib/encodings/__init__.py b/Lib/encodings/__init__.py index 8dd7130..10d881d 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,9 +94,8 @@ 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 = __import__('encodings.' + modname, fromlist=_import_tail, - level=0) - except ImportError: + mod = importlib.import_module('encodings.' + modname) + except ModuleNotFoundError: pass else: break |