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

Issue #20383: Introduce importlib.util.module_from_spec().

Browse source 
Along the way, dismantle importlib._bootstrap._SpecMethods as it was
no longer relevant and constructing the new function required
partially dismantling the class anyway.
This commit is contained in:
Brett Cannon 2014-05-30 14:55:29 -04:00
parent c8f0d6ebfc
commit 2a17bde930
17 changed files with 4536 additions and 4736 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/pydoc.py
View file

@ -263,9 +263,8 @@ def synopsis(filename, cache={}):
# XXX We probably don't need to pass in the loader here.
spec = importlib.util.spec_from_file_location('__temp__', filename,
loader=loader)
_spec = importlib._bootstrap._SpecMethods(spec)
try:
module = _spec.load()
module = importlib._bootstrap._load(spec)
except:
return None
del sys.modules['__temp__']
@ -297,9 +296,8 @@ def importfile(path):
loader = importlib._bootstrap.SourceFileLoader(name, path)
# XXX We probably don't need to pass in the loader here.
spec = importlib.util.spec_from_file_location(name, path, loader=loader)
_spec = importlib._bootstrap._SpecMethods(spec)
try:
return _spec.load()
return importlib._bootstrap._load(spec)
except:
raise ErrorDuringImport(path, sys.exc_info())
@ -2057,9 +2055,8 @@ class ModuleScanner:
else:
path = None
else:
_spec = importlib._bootstrap._SpecMethods(spec)
try:
module = _spec.load()
module = importlib._bootstrap._load(spec)
except ImportError:
if onerror:
onerror(modname)