mirror of
https://github.com/python/cpython.git
synced 2025-01-08 17:44:35 +08:00
cbf3b5cb76
svn+ssh://pythondev@svn.python.org/python/trunk !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! NOTE: The merge does NOT contain the modified file Python/import.c from r59288. I can't get it running. Nick, please check in the PEP 366 manually. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ........ r59279 | georg.brandl | 2007-12-02 19:17:50 +0100 (Sun, 02 Dec 2007) | 2 lines Fix a sentence I missed before. Do not merge to 3k. ........ r59281 | georg.brandl | 2007-12-02 22:58:54 +0100 (Sun, 02 Dec 2007) | 3 lines Add documentation for PySys_* functions. Written by Charlie Shepherd for GHOP. Also fixes #1245. ........ r59288 | nick.coghlan | 2007-12-03 13:55:17 +0100 (Mon, 03 Dec 2007) | 1 line Implement PEP 366 ........ r59290 | christian.heimes | 2007-12-03 14:47:29 +0100 (Mon, 03 Dec 2007) | 3 lines Applied my patch #1455 with some extra fixes for VS 2005 The new msvc9compiler module supports VS 2005 and VS 2008. I've also fixed build_ext to support PCbuild8 and PCbuild9 and backported my fix for xxmodule.c from py3k. The old code msvccompiler is still in place in case somebody likes to build an extension with VS 2003 or earlier. I've also updated the cygwin compiler module for VS 2005 and VS 2008. It works with VS 2005 but I'm unable to test it with VS 2008. We have to wait for a new version of cygwin. ........ r59291 | christian.heimes | 2007-12-03 14:55:16 +0100 (Mon, 03 Dec 2007) | 1 line Added comment to Misc/NEWS for r59290 ........ r59292 | christian.heimes | 2007-12-03 15:28:04 +0100 (Mon, 03 Dec 2007) | 1 line I followed MA Lemberg's suggestion and added comments to the late initialization of the type slots. ........ r59293 | facundo.batista | 2007-12-03 17:29:52 +0100 (Mon, 03 Dec 2007) | 3 lines Speedup and cleaning of __str__. Thanks Mark Dickinson. ........ r59294 | facundo.batista | 2007-12-03 18:55:00 +0100 (Mon, 03 Dec 2007) | 4 lines Faster _fix function, and some reordering for a more elegant coding. Thanks Mark Dickinson. ........ r59295 | martin.v.loewis | 2007-12-03 20:20:02 +0100 (Mon, 03 Dec 2007) | 5 lines Issue #1727780: Support loading pickles of random.Random objects created on 32-bit systems on 64-bit systems, and vice versa. As a consequence of the change, Random pickles created by Python 2.6 cannot be loaded in Python 2.5. ........ r59297 | facundo.batista | 2007-12-03 20:49:54 +0100 (Mon, 03 Dec 2007) | 3 lines Two small fixes. Issue 1547. ........ r59299 | georg.brandl | 2007-12-03 20:57:02 +0100 (Mon, 03 Dec 2007) | 2 lines #1548: fix apostroph placement. ........ r59300 | christian.heimes | 2007-12-03 21:01:02 +0100 (Mon, 03 Dec 2007) | 3 lines Patch #1537 from Chad Austin Change GeneratorExit's base class from Exception to BaseException (This time I'm applying the patch to the correct sandbox.) ........ r59302 | georg.brandl | 2007-12-03 21:03:46 +0100 (Mon, 03 Dec 2007) | 3 lines Add examples to the xmlrpclib docs. Written for GHOP by Josip Dzolonga. ........
133 lines
4.5 KiB
Python
Executable File
133 lines
4.5 KiB
Python
Executable File
"""runpy.py - locating and running Python code using the module namespace
|
|
|
|
Provides support for locating and running Python scripts using the Python
|
|
module namespace instead of the native filesystem.
|
|
|
|
This allows Python code to play nicely with non-filesystem based PEP 302
|
|
importers when locating support scripts as well as when importing modules.
|
|
"""
|
|
# Written by Nick Coghlan <ncoghlan at gmail.com>
|
|
# to implement PEP 338 (Executing Modules as Scripts)
|
|
|
|
import sys
|
|
import imp
|
|
try:
|
|
from imp import get_loader
|
|
except ImportError:
|
|
from pkgutil import get_loader
|
|
|
|
__all__ = [
|
|
"run_module",
|
|
]
|
|
|
|
|
|
def _run_code(code, run_globals, init_globals=None,
|
|
mod_name=None, mod_fname=None,
|
|
mod_loader=None, pkg_name=None):
|
|
"""Helper for _run_module_code"""
|
|
if init_globals is not None:
|
|
run_globals.update(init_globals)
|
|
run_globals.update(__name__ = mod_name,
|
|
__file__ = mod_fname,
|
|
__loader__ = mod_loader,
|
|
__package__ = pkg_name)
|
|
exec(code, run_globals)
|
|
return run_globals
|
|
|
|
def _run_module_code(code, init_globals=None,
|
|
mod_name=None, mod_fname=None,
|
|
mod_loader=None, pkg_name=None):
|
|
"""Helper for run_module"""
|
|
# Set up the top level namespace dictionary
|
|
temp_module = imp.new_module(mod_name)
|
|
mod_globals = temp_module.__dict__
|
|
# Modify sys.argv[0] and sys.module[mod_name]
|
|
saved_argv0 = sys.argv[0]
|
|
restore_module = mod_name in sys.modules
|
|
if restore_module:
|
|
saved_module = sys.modules[mod_name]
|
|
sys.argv[0] = mod_fname
|
|
sys.modules[mod_name] = temp_module
|
|
try:
|
|
_run_code(code, mod_globals, init_globals,
|
|
mod_name, mod_fname,
|
|
mod_loader, pkg_name)
|
|
finally:
|
|
sys.argv[0] = saved_argv0
|
|
if restore_module:
|
|
sys.modules[mod_name] = saved_module
|
|
else:
|
|
del sys.modules[mod_name]
|
|
# Copy the globals of the temporary module, as they
|
|
# may be cleared when the temporary module goes away
|
|
return mod_globals.copy()
|
|
|
|
|
|
# This helper is needed due to a missing component in the PEP 302
|
|
# loader protocol (specifically, "get_filename" is non-standard)
|
|
def _get_filename(loader, mod_name):
|
|
try:
|
|
get_filename = loader.get_filename
|
|
except AttributeError:
|
|
return None
|
|
else:
|
|
return get_filename(mod_name)
|
|
|
|
# Helper to get the loader, code and filename for a module
|
|
def _get_module_details(mod_name):
|
|
loader = get_loader(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)
|
|
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
|
|
|
|
|
|
# XXX ncoghlan: Should this be documented and made public?
|
|
def _run_module_as_main(mod_name, set_argv0=True):
|
|
"""Runs the designated module in the __main__ namespace
|
|
|
|
These __*__ magic variables will be overwritten:
|
|
__file__
|
|
__loader__
|
|
"""
|
|
loader, code, fname = _get_module_details(mod_name)
|
|
pkg_name = mod_name.rpartition('.')[0]
|
|
main_globals = sys.modules["__main__"].__dict__
|
|
if set_argv0:
|
|
sys.argv[0] = fname
|
|
return _run_code(code, main_globals, None,
|
|
"__main__", fname, loader, pkg_name)
|
|
|
|
def run_module(mod_name, init_globals=None,
|
|
run_name=None, alter_sys=False):
|
|
"""Execute a module's code without importing it
|
|
|
|
Returns the resulting top level namespace dictionary
|
|
"""
|
|
loader, code, fname = _get_module_details(mod_name)
|
|
if run_name is None:
|
|
run_name = mod_name
|
|
pkg_name = mod_name.rpartition('.')[0]
|
|
if alter_sys:
|
|
return _run_module_code(code, init_globals, run_name,
|
|
fname, loader, pkg_name)
|
|
else:
|
|
# Leave the sys module alone
|
|
return _run_code(code, {}, init_globals, run_name,
|
|
fname, loader, pkg_name)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
# Run the module specified as the next command line argument
|
|
if len(sys.argv) < 2:
|
|
print("No module specified for execution", file=sys.stderr)
|
|
else:
|
|
del sys.argv[0] # Make the requested module sys.argv[0]
|
|
_run_module_as_main(sys.argv[0])
|