Commit ae7b8f07 authored by Amaury Forgeot d'Arc's avatar Amaury Forgeot d'Arc

Issue #15110: Also hide importlib frames when importing a builtin module fails.

parent 9ed37433
...@@ -490,12 +490,16 @@ class BuiltinImporter: ...@@ -490,12 +490,16 @@ class BuiltinImporter:
"""Load a built-in module.""" """Load a built-in module."""
is_reload = fullname in sys.modules is_reload = fullname in sys.modules
try: try:
return _imp.init_builtin(fullname) return cls._exec_module(fullname)
except: except:
if not is_reload and fullname in sys.modules: if not is_reload and fullname in sys.modules:
del sys.modules[fullname] del sys.modules[fullname]
raise raise
@classmethod
def _exec_module(cls, fullname):
return _imp.init_builtin(fullname)
@classmethod @classmethod
@_requires_builtin @_requires_builtin
def get_code(cls, fullname): def get_code(cls, fullname):
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment