Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correctly cleanup sys.modules after executing runpy relative import

Browse source 
tests
Restore Python 2.4 ImportError when attempting to execute a package
(as imports cannot be guaranteed to work properly if you try it)
This commit is contained in:
Nick Coghlan 2007-07-23 13:41:45 +00:00
parent f17a2e4f87
commit ae21fc6d1f
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/runpy.py
View file

@ -84,10 +84,13 @@ def run_module(mod_name, init_globals=None,
"""
loader = get_loader(mod_name)
if loader is None:
raise ImportError("No module named " + mod_name)
raise ImportError("No module named %s" % mod_name)
if loader.is_package(mod_name):
raise ImportError(("%s is a package and cannot " +
"be directly executed") % mod_name)
code = loader.get_code(mod_name)
if code is None:
raise ImportError("No code object available for " + mod_name)
raise ImportError("No code object available for %s" % mod_name)
filename = _get_filename(loader, mod_name)
if run_name is None:
run_name = mod_name