mirror of
https://github.com/python/cpython.git
synced 2025-07-31 15:14:22 +00:00

svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r55413 | fred.drake | 2007-05-17 12:30:10 -0700 (Thu, 17 May 2007) | 1 line fix argument name in documentation; match the implementation ................ r55430 | jack.diederich | 2007-05-18 06:39:59 -0700 (Fri, 18 May 2007) | 1 line Implements class decorators, PEP 3129. ................ r55432 | guido.van.rossum | 2007-05-18 08:09:41 -0700 (Fri, 18 May 2007) | 2 lines obsubmit. ................ r55434 | guido.van.rossum | 2007-05-18 09:39:10 -0700 (Fri, 18 May 2007) | 3 lines Fix bug in test_inspect. (I presume this is how it should be fixed; Jack Diedrich, please verify.) ................ r55460 | brett.cannon | 2007-05-20 00:31:57 -0700 (Sun, 20 May 2007) | 4 lines Remove the imageop module. With imgfile already removed in Python 3.0 and rgbimg gone in Python 2.6 the unit tests themselves were made worthless. Plus third-party libraries perform the same function much better. ................ r55469 | neal.norwitz | 2007-05-20 11:28:20 -0700 (Sun, 20 May 2007) | 118 lines Merged revisions 55324-55467 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55348 | georg.brandl | 2007-05-15 13:19:34 -0700 (Tue, 15 May 2007) | 4 lines HTML-escape the plain traceback in cgitb's HTML output, to prevent the traceback inadvertently or maliciously closing the comment and injecting HTML into the error page. ........ r55372 | neal.norwitz | 2007-05-15 21:33:50 -0700 (Tue, 15 May 2007) | 6 lines Port rev 55353 from Guido: Add what looks like a necessary call to PyErr_NoMemory() when PyMem_MALLOC() fails. Will backport. ........ r55377 | neal.norwitz | 2007-05-15 22:06:33 -0700 (Tue, 15 May 2007) | 1 line Mention removal of some directories for obsolete platforms ........ r55380 | brett.cannon | 2007-05-15 22:50:03 -0700 (Tue, 15 May 2007) | 2 lines Change the maintainer of the BeOS port. ........ r55383 | georg.brandl | 2007-05-16 06:44:18 -0700 (Wed, 16 May 2007) | 2 lines Bug #1719995: don't use deprecated method in sets example. ........ r55386 | neal.norwitz | 2007-05-16 13:05:11 -0700 (Wed, 16 May 2007) | 5 lines Fix bug in marshal where bad data would cause a segfault due to lack of an infinite recursion check. Contributed by Damien Miller at Google. ........ r55389 | brett.cannon | 2007-05-16 15:42:29 -0700 (Wed, 16 May 2007) | 6 lines Remove the gopherlib module. It has been raising a DeprecationWarning since Python 2.5. Also remove gopher support from urllib/urllib2. As both imported gopherlib the usage of the support would have raised a DeprecationWarning. ........ r55394 | raymond.hettinger | 2007-05-16 18:08:04 -0700 (Wed, 16 May 2007) | 1 line calendar.py gets no benefit from xrange() instead of range() ........ r55395 | brett.cannon | 2007-05-16 19:02:56 -0700 (Wed, 16 May 2007) | 3 lines Complete deprecation of BaseException.message. Some subclasses were directly accessing the message attribute instead of using the descriptor. ........ r55396 | neal.norwitz | 2007-05-16 23:11:36 -0700 (Wed, 16 May 2007) | 4 lines Reduce the max stack depth to see if this fixes the segfaults on Windows and some other boxes. If this is successful, this rev should be backported. I'm not sure how close to the limit we should push this. ........ r55397 | neal.norwitz | 2007-05-16 23:23:50 -0700 (Wed, 16 May 2007) | 4 lines Set the depth to something very small to try to determine if the crashes on Windows are really due to the stack size or possibly some other problem. ........ r55398 | neal.norwitz | 2007-05-17 00:04:46 -0700 (Thu, 17 May 2007) | 4 lines Last try for tweaking the max stack depth. 5000 was the original value, 4000 didn't work either. 1000 does work on Windows. If 2000 works, that will hopefully be a reasonable balance. ........ r55412 | fred.drake | 2007-05-17 12:29:58 -0700 (Thu, 17 May 2007) | 1 line fix argument name in documentation; match the implementation ........ r55427 | neal.norwitz | 2007-05-17 22:47:16 -0700 (Thu, 17 May 2007) | 1 line Verify neither dumps or loads overflow the stack and segfault. ........ r55446 | collin.winter | 2007-05-18 16:11:24 -0700 (Fri, 18 May 2007) | 1 line Backport PEP 3110's new 'except' syntax to 2.6. ........ r55448 | raymond.hettinger | 2007-05-18 18:11:16 -0700 (Fri, 18 May 2007) | 1 line Improvements to NamedTuple's implementation, tests, and documentation ........ r55449 | raymond.hettinger | 2007-05-18 18:50:11 -0700 (Fri, 18 May 2007) | 1 line Fix beginner mistake -- don't mix spaces and tabs. ........ r55450 | neal.norwitz | 2007-05-18 20:48:47 -0700 (Fri, 18 May 2007) | 1 line Clear data so random memory does not get freed. Will backport. ........ r55452 | neal.norwitz | 2007-05-18 21:34:55 -0700 (Fri, 18 May 2007) | 3 lines Whoops, need to pay attention to those test failures. Move the clear to *before* the first use, not after. ........ r55453 | neal.norwitz | 2007-05-18 21:35:52 -0700 (Fri, 18 May 2007) | 1 line Give some clue as to what happened if the test fails. ........ r55455 | georg.brandl | 2007-05-19 11:09:26 -0700 (Sat, 19 May 2007) | 2 lines Fix docstring for add_package in site.py. ........ r55458 | brett.cannon | 2007-05-20 00:09:50 -0700 (Sun, 20 May 2007) | 2 lines Remove the rgbimg module. It has been deprecated since Python 2.5. ........ r55465 | nick.coghlan | 2007-05-20 04:12:49 -0700 (Sun, 20 May 2007) | 1 line Fix typo in example (should be backported, but my maintenance branch is woefully out of date) ........ ................ r55472 | brett.cannon | 2007-05-20 12:06:18 -0700 (Sun, 20 May 2007) | 2 lines Remove imageop from the Windows build process. ................ r55486 | neal.norwitz | 2007-05-20 23:59:52 -0700 (Sun, 20 May 2007) | 1 line Remove callable() builtin ................ r55506 | neal.norwitz | 2007-05-22 00:43:29 -0700 (Tue, 22 May 2007) | 78 lines Merged revisions 55468-55505 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55468 | neal.norwitz | 2007-05-20 11:06:27 -0700 (Sun, 20 May 2007) | 1 line rotor is long gone. ........ r55470 | neal.norwitz | 2007-05-20 11:43:00 -0700 (Sun, 20 May 2007) | 1 line Update directories/files at the top-level. ........ r55471 | brett.cannon | 2007-05-20 12:05:06 -0700 (Sun, 20 May 2007) | 2 lines Try to remove rgbimg from Windows builds. ........ r55474 | brett.cannon | 2007-05-20 16:17:38 -0700 (Sun, 20 May 2007) | 4 lines Remove the macfs module. This led to the deprecation of macostools.touched(); it completely relied on macfs and is a no-op on OS X according to code comments. ........ r55476 | brett.cannon | 2007-05-20 16:56:18 -0700 (Sun, 20 May 2007) | 3 lines Move imgfile import to the global namespace to trigger an import error ASAP to prevent creation of a test file. ........ r55477 | brett.cannon | 2007-05-20 16:57:38 -0700 (Sun, 20 May 2007) | 3 lines Cause posixfile to raise a DeprecationWarning. Documented as deprecated since Ptyhon 1.5. ........ r55479 | andrew.kuchling | 2007-05-20 17:03:15 -0700 (Sun, 20 May 2007) | 1 line Note removed modules ........ r55481 | martin.v.loewis | 2007-05-20 21:35:47 -0700 (Sun, 20 May 2007) | 2 lines Add Alexandre Vassalotti. ........ r55482 | george.yoshida | 2007-05-20 21:41:21 -0700 (Sun, 20 May 2007) | 4 lines fix against r55474 [Remove the macfs module] Remove "libmacfs.tex" from Makefile.deps and mac/mac.tex. ........ r55487 | raymond.hettinger | 2007-05-21 01:13:35 -0700 (Mon, 21 May 2007) | 1 line Replace assertion with straight error-checking. ........ r55489 | raymond.hettinger | 2007-05-21 09:40:10 -0700 (Mon, 21 May 2007) | 1 line Allow all alphanumeric and underscores in type and field names. ........ r55490 | facundo.batista | 2007-05-21 10:32:32 -0700 (Mon, 21 May 2007) | 5 lines Added timeout support to HTTPSConnection, through the socket.create_connection function. Also added a small test for this, and updated NEWS file. ........ r55495 | georg.brandl | 2007-05-21 13:34:16 -0700 (Mon, 21 May 2007) | 2 lines Patch #1686487: you can now pass any mapping after '**' in function calls. ........ r55502 | neal.norwitz | 2007-05-21 23:03:36 -0700 (Mon, 21 May 2007) | 1 line Document new params to HTTPSConnection ........ r55504 | neal.norwitz | 2007-05-22 00:16:10 -0700 (Tue, 22 May 2007) | 1 line Stop using METH_OLDARGS ........ r55505 | neal.norwitz | 2007-05-22 00:16:44 -0700 (Tue, 22 May 2007) | 1 line Stop using METH_OLDARGS implicitly ........ ................
733 lines
25 KiB
Python
733 lines
25 KiB
Python
"""
|
|
Import utilities
|
|
|
|
Exported classes:
|
|
ImportManager Manage the import process
|
|
|
|
Importer Base class for replacing standard import functions
|
|
BuiltinImporter Emulate the import mechanism for builtin and frozen modules
|
|
|
|
DynLoadSuffixImporter
|
|
"""
|
|
|
|
# note: avoid importing non-builtin modules
|
|
import imp ### not available in JPython?
|
|
import sys
|
|
import __builtin__
|
|
|
|
# for the DirectoryImporter
|
|
import struct
|
|
import marshal
|
|
|
|
__all__ = ["ImportManager","Importer","BuiltinImporter"]
|
|
|
|
_StringType = type('')
|
|
_ModuleType = type(sys) ### doesn't work in JPython...
|
|
|
|
class ImportManager:
|
|
"Manage the import process."
|
|
|
|
def install(self, namespace=vars(__builtin__)):
|
|
"Install this ImportManager into the specified namespace."
|
|
|
|
if isinstance(namespace, _ModuleType):
|
|
namespace = vars(namespace)
|
|
|
|
# Note: we have no notion of "chaining"
|
|
|
|
# Record the previous import hook, then install our own.
|
|
self.previous_importer = namespace['__import__']
|
|
self.namespace = namespace
|
|
namespace['__import__'] = self._import_hook
|
|
|
|
### fix this
|
|
#namespace['reload'] = self._reload_hook
|
|
|
|
def uninstall(self):
|
|
"Restore the previous import mechanism."
|
|
self.namespace['__import__'] = self.previous_importer
|
|
|
|
def add_suffix(self, suffix, importFunc):
|
|
assert hasattr(importFunc, '__call__')
|
|
self.fs_imp.add_suffix(suffix, importFunc)
|
|
|
|
######################################################################
|
|
#
|
|
# PRIVATE METHODS
|
|
#
|
|
|
|
clsFilesystemImporter = None
|
|
|
|
def __init__(self, fs_imp=None):
|
|
# we're definitely going to be importing something in the future,
|
|
# so let's just load the OS-related facilities.
|
|
if not _os_stat:
|
|
_os_bootstrap()
|
|
|
|
# This is the Importer that we use for grabbing stuff from the
|
|
# filesystem. It defines one more method (import_from_dir) for our use.
|
|
if fs_imp is None:
|
|
cls = self.clsFilesystemImporter or _FilesystemImporter
|
|
fs_imp = cls()
|
|
self.fs_imp = fs_imp
|
|
|
|
# Initialize the set of suffixes that we recognize and import.
|
|
# The default will import dynamic-load modules first, followed by
|
|
# .py files (or a .py file's cached bytecode)
|
|
for desc in imp.get_suffixes():
|
|
if desc[2] == imp.C_EXTENSION:
|
|
self.add_suffix(desc[0],
|
|
DynLoadSuffixImporter(desc).import_file)
|
|
self.add_suffix('.py', py_suffix_importer)
|
|
|
|
def _import_hook(self, fqname, globals=None, locals=None, fromlist=None):
|
|
"""Python calls this hook to locate and import a module."""
|
|
|
|
parts = fqname.split('.')
|
|
|
|
# determine the context of this import
|
|
parent = self._determine_import_context(globals)
|
|
|
|
# if there is a parent, then its importer should manage this import
|
|
if parent:
|
|
module = parent.__importer__._do_import(parent, parts, fromlist)
|
|
if module:
|
|
return module
|
|
|
|
# has the top module already been imported?
|
|
try:
|
|
top_module = sys.modules[parts[0]]
|
|
except KeyError:
|
|
|
|
# look for the topmost module
|
|
top_module = self._import_top_module(parts[0])
|
|
if not top_module:
|
|
# the topmost module wasn't found at all.
|
|
raise ImportError, 'No module named ' + fqname
|
|
|
|
# fast-path simple imports
|
|
if len(parts) == 1:
|
|
if not fromlist:
|
|
return top_module
|
|
|
|
if not top_module.__dict__.get('__ispkg__'):
|
|
# __ispkg__ isn't defined (the module was not imported by us),
|
|
# or it is zero.
|
|
#
|
|
# In the former case, there is no way that we could import
|
|
# sub-modules that occur in the fromlist (but we can't raise an
|
|
# error because it may just be names) because we don't know how
|
|
# to deal with packages that were imported by other systems.
|
|
#
|
|
# In the latter case (__ispkg__ == 0), there can't be any sub-
|
|
# modules present, so we can just return.
|
|
#
|
|
# In both cases, since len(parts) == 1, the top_module is also
|
|
# the "bottom" which is the defined return when a fromlist
|
|
# exists.
|
|
return top_module
|
|
|
|
importer = top_module.__dict__.get('__importer__')
|
|
if importer:
|
|
return importer._finish_import(top_module, parts[1:], fromlist)
|
|
|
|
# Grrr, some people "import os.path" or do "from os.path import ..."
|
|
if len(parts) == 2 and hasattr(top_module, parts[1]):
|
|
if fromlist:
|
|
return getattr(top_module, parts[1])
|
|
else:
|
|
return top_module
|
|
|
|
# If the importer does not exist, then we have to bail. A missing
|
|
# importer means that something else imported the module, and we have
|
|
# no knowledge of how to get sub-modules out of the thing.
|
|
raise ImportError, 'No module named ' + fqname
|
|
|
|
def _determine_import_context(self, globals):
|
|
"""Returns the context in which a module should be imported.
|
|
|
|
The context could be a loaded (package) module and the imported module
|
|
will be looked for within that package. The context could also be None,
|
|
meaning there is no context -- the module should be looked for as a
|
|
"top-level" module.
|
|
"""
|
|
|
|
if not globals or not globals.get('__importer__'):
|
|
# globals does not refer to one of our modules or packages. That
|
|
# implies there is no relative import context (as far as we are
|
|
# concerned), and it should just pick it off the standard path.
|
|
return None
|
|
|
|
# The globals refer to a module or package of ours. It will define
|
|
# the context of the new import. Get the module/package fqname.
|
|
parent_fqname = globals['__name__']
|
|
|
|
# if a package is performing the import, then return itself (imports
|
|
# refer to pkg contents)
|
|
if globals['__ispkg__']:
|
|
parent = sys.modules[parent_fqname]
|
|
assert globals is parent.__dict__
|
|
return parent
|
|
|
|
i = parent_fqname.rfind('.')
|
|
|
|
# a module outside of a package has no particular import context
|
|
if i == -1:
|
|
return None
|
|
|
|
# if a module in a package is performing the import, then return the
|
|
# package (imports refer to siblings)
|
|
parent_fqname = parent_fqname[:i]
|
|
parent = sys.modules[parent_fqname]
|
|
assert parent.__name__ == parent_fqname
|
|
return parent
|
|
|
|
def _import_top_module(self, name):
|
|
# scan sys.path looking for a location in the filesystem that contains
|
|
# the module, or an Importer object that can import the module.
|
|
for item in sys.path:
|
|
if isinstance(item, _StringType):
|
|
module = self.fs_imp.import_from_dir(item, name)
|
|
else:
|
|
module = item.import_top(name)
|
|
if module:
|
|
return module
|
|
return None
|
|
|
|
def _reload_hook(self, module):
|
|
"Python calls this hook to reload a module."
|
|
|
|
# reloading of a module may or may not be possible (depending on the
|
|
# importer), but at least we can validate that it's ours to reload
|
|
importer = module.__dict__.get('__importer__')
|
|
if not importer:
|
|
### oops. now what...
|
|
pass
|
|
|
|
# okay. it is using the imputil system, and we must delegate it, but
|
|
# we don't know what to do (yet)
|
|
### we should blast the module dict and do another get_code(). need to
|
|
### flesh this out and add proper docco...
|
|
raise SystemError, "reload not yet implemented"
|
|
|
|
|
|
class Importer:
|
|
"Base class for replacing standard import functions."
|
|
|
|
def import_top(self, name):
|
|
"Import a top-level module."
|
|
return self._import_one(None, name, name)
|
|
|
|
######################################################################
|
|
#
|
|
# PRIVATE METHODS
|
|
#
|
|
def _finish_import(self, top, parts, fromlist):
|
|
# if "a.b.c" was provided, then load the ".b.c" portion down from
|
|
# below the top-level module.
|
|
bottom = self._load_tail(top, parts)
|
|
|
|
# if the form is "import a.b.c", then return "a"
|
|
if not fromlist:
|
|
# no fromlist: return the top of the import tree
|
|
return top
|
|
|
|
# the top module was imported by self.
|
|
#
|
|
# this means that the bottom module was also imported by self (just
|
|
# now, or in the past and we fetched it from sys.modules).
|
|
#
|
|
# since we imported/handled the bottom module, this means that we can
|
|
# also handle its fromlist (and reliably use __ispkg__).
|
|
|
|
# if the bottom node is a package, then (potentially) import some
|
|
# modules.
|
|
#
|
|
# note: if it is not a package, then "fromlist" refers to names in
|
|
# the bottom module rather than modules.
|
|
# note: for a mix of names and modules in the fromlist, we will
|
|
# import all modules and insert those into the namespace of
|
|
# the package module. Python will pick up all fromlist names
|
|
# from the bottom (package) module; some will be modules that
|
|
# we imported and stored in the namespace, others are expected
|
|
# to be present already.
|
|
if bottom.__ispkg__:
|
|
self._import_fromlist(bottom, fromlist)
|
|
|
|
# if the form is "from a.b import c, d" then return "b"
|
|
return bottom
|
|
|
|
def _import_one(self, parent, modname, fqname):
|
|
"Import a single module."
|
|
|
|
# has the module already been imported?
|
|
try:
|
|
return sys.modules[fqname]
|
|
except KeyError:
|
|
pass
|
|
|
|
# load the module's code, or fetch the module itself
|
|
result = self.get_code(parent, modname, fqname)
|
|
if result is None:
|
|
return None
|
|
|
|
module = self._process_result(result, fqname)
|
|
|
|
# insert the module into its parent
|
|
if parent:
|
|
setattr(parent, modname, module)
|
|
return module
|
|
|
|
def _process_result(self, result, fqname):
|
|
# unpack result
|
|
ispkg, code, values = result
|
|
|
|
# did get_code() return an actual module? (rather than a code object)
|
|
is_module = isinstance(code, _ModuleType)
|
|
|
|
# use the returned module, or create a new one to exec code into
|
|
if is_module:
|
|
module = code
|
|
else:
|
|
module = imp.new_module(fqname)
|
|
|
|
### record packages a bit differently??
|
|
module.__importer__ = self
|
|
module.__ispkg__ = ispkg
|
|
|
|
# insert additional values into the module (before executing the code)
|
|
module.__dict__.update(values)
|
|
|
|
# the module is almost ready... make it visible
|
|
sys.modules[fqname] = module
|
|
|
|
# execute the code within the module's namespace
|
|
if not is_module:
|
|
try:
|
|
exec(code, module.__dict__)
|
|
except:
|
|
if fqname in sys.modules:
|
|
del sys.modules[fqname]
|
|
raise
|
|
|
|
# fetch from sys.modules instead of returning module directly.
|
|
# also make module's __name__ agree with fqname, in case
|
|
# the "exec code in module.__dict__" played games on us.
|
|
module = sys.modules[fqname]
|
|
module.__name__ = fqname
|
|
return module
|
|
|
|
def _load_tail(self, m, parts):
|
|
"""Import the rest of the modules, down from the top-level module.
|
|
|
|
Returns the last module in the dotted list of modules.
|
|
"""
|
|
for part in parts:
|
|
fqname = "%s.%s" % (m.__name__, part)
|
|
m = self._import_one(m, part, fqname)
|
|
if not m:
|
|
raise ImportError, "No module named " + fqname
|
|
return m
|
|
|
|
def _import_fromlist(self, package, fromlist):
|
|
'Import any sub-modules in the "from" list.'
|
|
|
|
# if '*' is present in the fromlist, then look for the '__all__'
|
|
# variable to find additional items (modules) to import.
|
|
if '*' in fromlist:
|
|
fromlist = list(fromlist) + \
|
|
list(package.__dict__.get('__all__', []))
|
|
|
|
for sub in fromlist:
|
|
# if the name is already present, then don't try to import it (it
|
|
# might not be a module!).
|
|
if sub != '*' and not hasattr(package, sub):
|
|
subname = "%s.%s" % (package.__name__, sub)
|
|
submod = self._import_one(package, sub, subname)
|
|
if not submod:
|
|
raise ImportError, "cannot import name " + subname
|
|
|
|
def _do_import(self, parent, parts, fromlist):
|
|
"""Attempt to import the module relative to parent.
|
|
|
|
This method is used when the import context specifies that <self>
|
|
imported the parent module.
|
|
"""
|
|
top_name = parts[0]
|
|
top_fqname = parent.__name__ + '.' + top_name
|
|
top_module = self._import_one(parent, top_name, top_fqname)
|
|
if not top_module:
|
|
# this importer and parent could not find the module (relatively)
|
|
return None
|
|
|
|
return self._finish_import(top_module, parts[1:], fromlist)
|
|
|
|
######################################################################
|
|
#
|
|
# METHODS TO OVERRIDE
|
|
#
|
|
def get_code(self, parent, modname, fqname):
|
|
"""Find and retrieve the code for the given module.
|
|
|
|
parent specifies a parent module to define a context for importing. It
|
|
may be None, indicating no particular context for the search.
|
|
|
|
modname specifies a single module (not dotted) within the parent.
|
|
|
|
fqname specifies the fully-qualified module name. This is a
|
|
(potentially) dotted name from the "root" of the module namespace
|
|
down to the modname.
|
|
If there is no parent, then modname==fqname.
|
|
|
|
This method should return None, or a 3-tuple.
|
|
|
|
* If the module was not found, then None should be returned.
|
|
|
|
* The first item of the 2- or 3-tuple should be the integer 0 or 1,
|
|
specifying whether the module that was found is a package or not.
|
|
|
|
* The second item is the code object for the module (it will be
|
|
executed within the new module's namespace). This item can also
|
|
be a fully-loaded module object (e.g. loaded from a shared lib).
|
|
|
|
* The third item is a dictionary of name/value pairs that will be
|
|
inserted into new module before the code object is executed. This
|
|
is provided in case the module's code expects certain values (such
|
|
as where the module was found). When the second item is a module
|
|
object, then these names/values will be inserted *after* the module
|
|
has been loaded/initialized.
|
|
"""
|
|
raise RuntimeError, "get_code not implemented"
|
|
|
|
|
|
######################################################################
|
|
#
|
|
# Some handy stuff for the Importers
|
|
#
|
|
|
|
# byte-compiled file suffix character
|
|
_suffix_char = __debug__ and 'c' or 'o'
|
|
|
|
# byte-compiled file suffix
|
|
_suffix = '.py' + _suffix_char
|
|
|
|
def _compile(pathname, timestamp):
|
|
"""Compile (and cache) a Python source file.
|
|
|
|
The file specified by <pathname> is compiled to a code object and
|
|
returned.
|
|
|
|
Presuming the appropriate privileges exist, the bytecodes will be
|
|
saved back to the filesystem for future imports. The source file's
|
|
modification timestamp must be provided as a Long value.
|
|
"""
|
|
codestring = open(pathname, 'rU').read()
|
|
if codestring and codestring[-1] != '\n':
|
|
codestring = codestring + '\n'
|
|
code = __builtin__.compile(codestring, pathname, 'exec')
|
|
|
|
# try to cache the compiled code
|
|
try:
|
|
f = open(pathname + _suffix_char, 'wb')
|
|
except IOError:
|
|
pass
|
|
else:
|
|
f.write('\0\0\0\0')
|
|
f.write(struct.pack('<I', timestamp))
|
|
marshal.dump(code, f)
|
|
f.flush()
|
|
f.seek(0, 0)
|
|
f.write(imp.get_magic())
|
|
f.close()
|
|
|
|
return code
|
|
|
|
_os_stat = _os_path_join = None
|
|
def _os_bootstrap():
|
|
"Set up 'os' module replacement functions for use during import bootstrap."
|
|
|
|
names = sys.builtin_module_names
|
|
|
|
join = None
|
|
if 'posix' in names:
|
|
sep = '/'
|
|
from posix import stat
|
|
elif 'nt' in names:
|
|
sep = '\\'
|
|
from nt import stat
|
|
elif 'dos' in names:
|
|
sep = '\\'
|
|
from dos import stat
|
|
elif 'os2' in names:
|
|
sep = '\\'
|
|
from os2 import stat
|
|
elif 'mac' in names:
|
|
from mac import stat
|
|
def join(a, b):
|
|
if a == '':
|
|
return b
|
|
if ':' not in a:
|
|
a = ':' + a
|
|
if a[-1:] != ':':
|
|
a = a + ':'
|
|
return a + b
|
|
else:
|
|
raise ImportError, 'no os specific module found'
|
|
|
|
if join is None:
|
|
def join(a, b, sep=sep):
|
|
if a == '':
|
|
return b
|
|
lastchar = a[-1:]
|
|
if lastchar == '/' or lastchar == sep:
|
|
return a + b
|
|
return a + sep + b
|
|
|
|
global _os_stat
|
|
_os_stat = stat
|
|
|
|
global _os_path_join
|
|
_os_path_join = join
|
|
|
|
def _os_path_isdir(pathname):
|
|
"Local replacement for os.path.isdir()."
|
|
try:
|
|
s = _os_stat(pathname)
|
|
except OSError:
|
|
return None
|
|
return (s.st_mode & 0170000) == 0040000
|
|
|
|
def _timestamp(pathname):
|
|
"Return the file modification time as a Long."
|
|
try:
|
|
s = _os_stat(pathname)
|
|
except OSError:
|
|
return None
|
|
return int(s.st_mtime)
|
|
|
|
|
|
######################################################################
|
|
#
|
|
# Emulate the import mechanism for builtin and frozen modules
|
|
#
|
|
class BuiltinImporter(Importer):
|
|
def get_code(self, parent, modname, fqname):
|
|
if parent:
|
|
# these modules definitely do not occur within a package context
|
|
return None
|
|
|
|
# look for the module
|
|
if imp.is_builtin(modname):
|
|
type = imp.C_BUILTIN
|
|
elif imp.is_frozen(modname):
|
|
type = imp.PY_FROZEN
|
|
else:
|
|
# not found
|
|
return None
|
|
|
|
# got it. now load and return it.
|
|
module = imp.load_module(modname, None, modname, ('', '', type))
|
|
return 0, module, { }
|
|
|
|
|
|
######################################################################
|
|
#
|
|
# Internal importer used for importing from the filesystem
|
|
#
|
|
class _FilesystemImporter(Importer):
|
|
def __init__(self):
|
|
self.suffixes = [ ]
|
|
|
|
def add_suffix(self, suffix, importFunc):
|
|
assert hasattr(importFunc, '__call__')
|
|
self.suffixes.append((suffix, importFunc))
|
|
|
|
def import_from_dir(self, dir, fqname):
|
|
result = self._import_pathname(_os_path_join(dir, fqname), fqname)
|
|
if result:
|
|
return self._process_result(result, fqname)
|
|
return None
|
|
|
|
def get_code(self, parent, modname, fqname):
|
|
# This importer is never used with an empty parent. Its existence is
|
|
# private to the ImportManager. The ImportManager uses the
|
|
# import_from_dir() method to import top-level modules/packages.
|
|
# This method is only used when we look for a module within a package.
|
|
assert parent
|
|
|
|
for submodule_path in parent.__path__:
|
|
code = self._import_pathname(_os_path_join(submodule_path, modname), fqname)
|
|
if code is not None:
|
|
return code
|
|
return self._import_pathname(_os_path_join(parent.__pkgdir__, modname),
|
|
fqname)
|
|
|
|
def _import_pathname(self, pathname, fqname):
|
|
if _os_path_isdir(pathname):
|
|
result = self._import_pathname(_os_path_join(pathname, '__init__'),
|
|
fqname)
|
|
if result:
|
|
values = result[2]
|
|
values['__pkgdir__'] = pathname
|
|
values['__path__'] = [ pathname ]
|
|
return 1, result[1], values
|
|
return None
|
|
|
|
for suffix, importFunc in self.suffixes:
|
|
filename = pathname + suffix
|
|
try:
|
|
finfo = _os_stat(filename)
|
|
except OSError:
|
|
pass
|
|
else:
|
|
return importFunc(filename, finfo, fqname)
|
|
return None
|
|
|
|
######################################################################
|
|
#
|
|
# SUFFIX-BASED IMPORTERS
|
|
#
|
|
|
|
def py_suffix_importer(filename, finfo, fqname):
|
|
file = filename[:-3] + _suffix
|
|
t_py = int(finfo[8])
|
|
t_pyc = _timestamp(file)
|
|
|
|
code = None
|
|
if t_pyc is not None and t_pyc >= t_py:
|
|
f = open(file, 'rb')
|
|
if f.read(4) == imp.get_magic():
|
|
t = struct.unpack('<I', f.read(4))[0]
|
|
if t == t_py:
|
|
code = marshal.load(f)
|
|
f.close()
|
|
if code is None:
|
|
file = filename
|
|
code = _compile(file, t_py)
|
|
|
|
return 0, code, { '__file__' : file }
|
|
|
|
class DynLoadSuffixImporter:
|
|
def __init__(self, desc):
|
|
self.desc = desc
|
|
|
|
def import_file(self, filename, finfo, fqname):
|
|
fp = open(filename, self.desc[1])
|
|
module = imp.load_module(fqname, fp, filename, self.desc)
|
|
module.__file__ = filename
|
|
return 0, module, { }
|
|
|
|
|
|
######################################################################
|
|
|
|
def _print_importers():
|
|
items = sys.modules.items()
|
|
items.sort()
|
|
for name, module in items:
|
|
if module:
|
|
print(name, module.__dict__.get('__importer__', '-- no importer'))
|
|
else:
|
|
print(name, '-- non-existent module')
|
|
|
|
def _test_revamp():
|
|
ImportManager().install()
|
|
sys.path.insert(0, BuiltinImporter())
|
|
|
|
######################################################################
|
|
|
|
#
|
|
# TODO
|
|
#
|
|
# from Finn Bock:
|
|
# type(sys) is not a module in JPython. what to use instead?
|
|
# imp.C_EXTENSION is not in JPython. same for get_suffixes and new_module
|
|
#
|
|
# given foo.py of:
|
|
# import sys
|
|
# sys.modules['foo'] = sys
|
|
#
|
|
# ---- standard import mechanism
|
|
# >>> import foo
|
|
# >>> foo
|
|
# <module 'sys' (built-in)>
|
|
#
|
|
# ---- revamped import mechanism
|
|
# >>> import imputil
|
|
# >>> imputil._test_revamp()
|
|
# >>> import foo
|
|
# >>> foo
|
|
# <module 'foo' from 'foo.py'>
|
|
#
|
|
#
|
|
# from MAL:
|
|
# should BuiltinImporter exist in sys.path or hard-wired in ImportManager?
|
|
# need __path__ processing
|
|
# performance
|
|
# move chaining to a subclass [gjs: it's been nuked]
|
|
# deinstall should be possible
|
|
# query mechanism needed: is a specific Importer installed?
|
|
# py/pyc/pyo piping hooks to filter/process these files
|
|
# wish list:
|
|
# distutils importer hooked to list of standard Internet repositories
|
|
# module->file location mapper to speed FS-based imports
|
|
# relative imports
|
|
# keep chaining so that it can play nice with other import hooks
|
|
#
|
|
# from Gordon:
|
|
# push MAL's mapper into sys.path[0] as a cache (hard-coded for apps)
|
|
#
|
|
# from Guido:
|
|
# need hook for MAL's walk-me-up import strategy, or Tim's absolute strategy
|
|
# watch out for sys.modules[...] is None
|
|
# flag to force absolute imports? (speeds _determine_import_context and
|
|
# checking for a relative module)
|
|
# insert names of archives into sys.path (see quote below)
|
|
# note: reload does NOT blast module dict
|
|
# shift import mechanisms and policies around; provide for hooks, overrides
|
|
# (see quote below)
|
|
# add get_source stuff
|
|
# get_topcode and get_subcode
|
|
# CRLF handling in _compile
|
|
# race condition in _compile
|
|
# refactoring of os.py to deal with _os_bootstrap problem
|
|
# any special handling to do for importing a module with a SyntaxError?
|
|
# (e.g. clean up the traceback)
|
|
# implement "domain" for path-type functionality using pkg namespace
|
|
# (rather than FS-names like __path__)
|
|
# don't use the word "private"... maybe "internal"
|
|
#
|
|
#
|
|
# Guido's comments on sys.path caching:
|
|
#
|
|
# We could cache this in a dictionary: the ImportManager can have a
|
|
# cache dict mapping pathnames to importer objects, and a separate
|
|
# method for coming up with an importer given a pathname that's not yet
|
|
# in the cache. The method should do a stat and/or look at the
|
|
# extension to decide which importer class to use; you can register new
|
|
# importer classes by registering a suffix or a Boolean function, plus a
|
|
# class. If you register a new importer class, the cache is zapped.
|
|
# The cache is independent from sys.path (but maintained per
|
|
# ImportManager instance) so that rearrangements of sys.path do the
|
|
# right thing. If a path is dropped from sys.path the corresponding
|
|
# cache entry is simply no longer used.
|
|
#
|
|
# My/Guido's comments on factoring ImportManager and Importer:
|
|
#
|
|
# > However, we still have a tension occurring here:
|
|
# >
|
|
# > 1) implementing policy in ImportManager assists in single-point policy
|
|
# > changes for app situations
|
|
# > 2) implementing policy in Importer assists in package-private policy
|
|
# > changes for normal, operating conditions
|
|
# >
|
|
# > I'll see if I can sort out a way to do this. Maybe the Importer class will
|
|
# > implement the methods (which can be overridden to change policy) by
|
|
# > delegating to ImportManager.
|
|
#
|
|
# Maybe also think about what kind of policies an Importer would be
|
|
# likely to want to change. I have a feeling that a lot of the code
|
|
# there is actually not so much policy but a *necessity* to get things
|
|
# working given the calling conventions for the __import__ hook: whether
|
|
# to return the head or tail of a dotted name, or when to do the "finish
|
|
# fromlist" stuff.
|
|
#
|