mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 09:45:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merged revisions 69419-69420 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69419 | nick.coghlan | 2009-02-08 11:26:34 +1000 (Sun, 08 Feb 2009) | 1 line

  Issue 4195: Restore the ability to execute packages with the -m switch (but this time in a way that leaves the import machinery in a valid state). (Original patch by Andi Vajda)
........
  r69420 | nick.coghlan | 2009-02-08 11:46:01 +1000 (Sun, 08 Feb 2009) | 1 line

  Mention patch submitter in NEWS entry for r69419
........
This commit is contained in:
Nick Coghlan 2009-02-08 01:58:26 +00:00
parent f72d9fb02f
commit 3f48ae35c7
6 changed files with 112 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Lib/runpy.py
View file

@ -80,13 +80,19 @@ def _get_module_details(mod_name):
if loader is None:
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)
if mod_name == "__main__" or mod_name.endswith(".__main__"):
raise ImportError(("Cannot use package as __main__ module"))
try:
pkg_main_name = mod_name + ".__main__"
return _get_module_details(pkg_main_name)
except ImportError as e:
raise ImportError(("%s; %r is a package and cannot " +
"be directly executed") %(e, mod_name))
code = loader.get_code(mod_name)
if code is None:
raise ImportError("No code object available for %s" % mod_name)
filename = _get_filename(loader, mod_name)
return loader, code, filename
return mod_name, loader, code, filename
# XXX ncoghlan: Should this be documented and made public?
@ -101,12 +107,12 @@ def _run_module_as_main(mod_name, set_argv0=True):
__loader__
"""
try:
loader, code, fname = _get_module_details(mod_name)
mod_name, loader, code, fname = _get_module_details(mod_name)
except ImportError as exc:
# Try to provide a good error message
# for directories, zip files and the -m switch
if set_argv0:
# For -m switch, just disply the exception
# For -m switch, just display the exception
info = str(exc)
else:
# For directories/zipfiles, let the user
@ -127,7 +133,7 @@ def run_module(mod_name, init_globals=None,
Returns the resulting top level namespace dictionary
"""
loader, code, fname = _get_module_details(mod_name)
mod_name, loader, code, fname = _get_module_details(mod_name)
if run_name is None:
run_name = mod_name
pkg_name = mod_name.rpartition('.')[0]