mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 02:15:10 +00:00 
			
		
		
		
	 c3f30c4337
			
		
	
	
		c3f30c4337
		
	
	
	
	
		
			
			svn+ssh://pythondev@svn.python.org/python/trunk ........ r60901 | eric.smith | 2008-02-19 14:21:56 +0100 (Tue, 19 Feb 2008) | 1 line Added PEP 3101. ........ r60907 | georg.brandl | 2008-02-20 20:12:36 +0100 (Wed, 20 Feb 2008) | 2 lines Fixes contributed by Ori Avtalion. ........ r60909 | eric.smith | 2008-02-21 00:34:22 +0100 (Thu, 21 Feb 2008) | 1 line Trim leading zeros from a floating point exponent, per C99. See issue 1600. As far as I know, this only affects Windows. Add float type 'n' to PyOS_ascii_formatd (see PEP 3101 for 'n' description). ........ r60910 | eric.smith | 2008-02-21 00:39:28 +0100 (Thu, 21 Feb 2008) | 1 line Now that PyOS_ascii_formatd supports the 'n' format, simplify the float formatting code to just call it. ........ r60918 | andrew.kuchling | 2008-02-21 15:23:38 +0100 (Thu, 21 Feb 2008) | 2 lines Close manifest file. This change doesn't make any difference to CPython, but is a necessary fix for Jython. ........ r60921 | guido.van.rossum | 2008-02-21 18:46:16 +0100 (Thu, 21 Feb 2008) | 2 lines Remove news about float repr() -- issue 1580 is still in limbo. ........ r60923 | guido.van.rossum | 2008-02-21 19:18:37 +0100 (Thu, 21 Feb 2008) | 5 lines Removed uses of dict.has_key() from distutils, and uses of callable() from copy_reg.py, so the interpreter now starts up without warnings when '-3' is given. More work like this needs to be done in the rest of the stdlib. ........ r60924 | thomas.heller | 2008-02-21 19:28:48 +0100 (Thu, 21 Feb 2008) | 4 lines configure.ac: Remove the configure check for _Bool, it is already done in the top-level Python configure script. configure, fficonfig.h.in: regenerated. ........ r60925 | thomas.heller | 2008-02-21 19:52:20 +0100 (Thu, 21 Feb 2008) | 3 lines Replace 'has_key()' with 'in'. Replace 'raise Error, stuff' with 'raise Error(stuff)'. ........ r60927 | raymond.hettinger | 2008-02-21 20:24:53 +0100 (Thu, 21 Feb 2008) | 1 line Update more instances of has_key(). ........ r60928 | guido.van.rossum | 2008-02-21 20:46:35 +0100 (Thu, 21 Feb 2008) | 3 lines Fix a few typos and layout glitches (more work is needed). Move 2.5 news to Misc/HISTORY. ........ r60936 | georg.brandl | 2008-02-21 21:33:38 +0100 (Thu, 21 Feb 2008) | 2 lines #2079: typo in userdict docs. ........ r60938 | georg.brandl | 2008-02-21 21:38:13 +0100 (Thu, 21 Feb 2008) | 2 lines Part of #2154: minimal syntax fixes in doc example snippets. ........ r60942 | raymond.hettinger | 2008-02-22 04:16:42 +0100 (Fri, 22 Feb 2008) | 1 line First draft for itertools.product(). Docs and other updates forthcoming. ........ r60955 | nick.coghlan | 2008-02-22 11:54:06 +0100 (Fri, 22 Feb 2008) | 1 line Try to make command line error messages from runpy easier to understand (and suppress traceback cruft from the implicitly invoked runpy machinery) ........ r60956 | georg.brandl | 2008-02-22 13:31:45 +0100 (Fri, 22 Feb 2008) | 2 lines A lot more typo fixes by Ori Avtalion. ........ r60957 | georg.brandl | 2008-02-22 13:56:34 +0100 (Fri, 22 Feb 2008) | 2 lines Don't reference pyshell. ........ r60958 | georg.brandl | 2008-02-22 13:57:05 +0100 (Fri, 22 Feb 2008) | 2 lines Another fix. ........
		
			
				
	
	
		
			148 lines
		
	
	
	
		
			5.1 KiB
		
	
	
	
		
			Python
		
	
	
		
			Executable file
		
	
	
	
	
			
		
		
	
	
			148 lines
		
	
	
	
		
			5.1 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?
 | |
| # (Current thoughts: don't repeat the mistake that lead to its
 | |
| # creation when run_module() no longer met the needs of
 | |
| # mainmodule.c, but couldn't be changed because it was 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__
 | |
|     """
 | |
|     try:
 | |
|         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
 | |
|             info = str(exc)
 | |
|         else:
 | |
|             # For directories/zipfiles, let the user
 | |
|             # know what the code was looking for
 | |
|             info = "can't find '__main__.py' in %r" % sys.argv[0]
 | |
|         msg = "%s: %s" % (sys.executable, info)
 | |
|         sys.exit(msg)
 | |
|     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])
 |