mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Issue #15902: Fix imp.load_module() to accept None as a file when

Browse source 
trying to load an extension module.

While at it, also add a proper unittest.skipIf() guard to another test
involving imp.load_dynamic().
This commit is contained in:
Brett Cannon 2013-05-03 10:37:08 -04:00
parent b98dcc1f53
commit 9d0f772c51
3 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/imp.py
View file

@ -168,7 +168,7 @@ def load_module(name, file, filename, details):
warnings.simplefilter('ignore')
if mode and (not mode.startswith(('r', 'U')) or '+' in mode):
raise ValueError('invalid file open mode {!r}'.format(mode))
elif file is None and type_ in {PY_SOURCE, PY_COMPILED, C_EXTENSION}:
elif file is None and type_ in {PY_SOURCE, PY_COMPILED}:
msg = 'file object required for import (type code {})'.format(type_)
raise ValueError(msg)
elif type_ == PY_SOURCE:
@ -176,7 +176,11 @@ def load_module(name, file, filename, details):
elif type_ == PY_COMPILED:
return load_compiled(name, filename, file)
elif type_ == C_EXTENSION and load_dynamic is not None:
return load_dynamic(name, filename, file)
if file is None:
with open(filename, 'rb') as opened_file:
return load_dynamic(name, filename, opened_file)
else:
return load_dynamic(name, filename, file)
elif type_ == PKG_DIRECTORY:
return load_package(name, filename)
elif type_ == C_BUILTIN: