mirror of
https://github.com/python/cpython.git
synced 2024-12-01 11:15:56 +01:00
e7ba495627
svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r55636 | neal.norwitz | 2007-05-29 00:06:39 -0700 (Tue, 29 May 2007) | 149 lines Merged revisions 55506-55635 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55507 | georg.brandl | 2007-05-22 07:28:17 -0700 (Tue, 22 May 2007) | 2 lines Remove the "panel" module doc file which has been ignored since 1994. ........ r55522 | mark.hammond | 2007-05-22 19:04:28 -0700 (Tue, 22 May 2007) | 4 lines Remove definition of PY_UNICODE_TYPE from pyconfig.h, allowing the definition in unicodeobject.h to be used, giving us the desired wchar_t in place of 'unsigned short'. As discussed on python-dev. ........ r55525 | neal.norwitz | 2007-05-22 23:35:32 -0700 (Tue, 22 May 2007) | 6 lines Add -3 option to the interpreter to warn about features that are deprecated and will be changed/removed in Python 3.0. This patch is mostly from Anthony. I tweaked some format and added a little doc. ........ r55527 | neal.norwitz | 2007-05-22 23:57:35 -0700 (Tue, 22 May 2007) | 1 line Whitespace cleanup ........ r55528 | neal.norwitz | 2007-05-22 23:58:36 -0700 (Tue, 22 May 2007) | 1 line Add a bunch more deprecation warnings for builtins that are going away in 3.0 ........ r55549 | georg.brandl | 2007-05-24 09:49:29 -0700 (Thu, 24 May 2007) | 2 lines shlex.split() now has an optional "posix" parameter. ........ r55550 | georg.brandl | 2007-05-24 10:33:33 -0700 (Thu, 24 May 2007) | 2 lines Fix parameter passing. ........ r55555 | facundo.batista | 2007-05-24 10:50:54 -0700 (Thu, 24 May 2007) | 6 lines Added an optional timeout parameter to urllib.ftpwrapper, with tests (for this and a basic one, because there weren't any). Changed also NEWS, but didn't find documentation for this function, assumed it wasn't public... ........ r55563 | facundo.batista | 2007-05-24 13:01:59 -0700 (Thu, 24 May 2007) | 4 lines Removed the .recv() in the test, is not necessary, and was causing problems that didn't have anything to do with was actually being tested... ........ r55564 | facundo.batista | 2007-05-24 13:51:19 -0700 (Thu, 24 May 2007) | 5 lines Let's see if reading exactly what is written allow this live test to pass (now I know why there were so few tests in ftp, http, etc, :( ). ........ r55567 | facundo.batista | 2007-05-24 20:10:28 -0700 (Thu, 24 May 2007) | 4 lines Trying to make the tests work in Windows and Solaris, everywhere else just works ........ r55568 | facundo.batista | 2007-05-24 20:47:19 -0700 (Thu, 24 May 2007) | 4 lines Fixing stupid error, and introducing a sleep, to see if the other thread is awakened and finish sending data. ........ r55569 | facundo.batista | 2007-05-24 21:20:22 -0700 (Thu, 24 May 2007) | 4 lines Commenting out the tests until find out who can test them in one of the problematic enviroments. ........ r55570 | neal.norwitz | 2007-05-24 22:13:40 -0700 (Thu, 24 May 2007) | 2 lines Get test passing again by commenting out the reference to the test class. ........ r55575 | vinay.sajip | 2007-05-25 00:05:59 -0700 (Fri, 25 May 2007) | 1 line Updated docstring for SysLogHandler (#1720726). ........ r55576 | vinay.sajip | 2007-05-25 00:06:55 -0700 (Fri, 25 May 2007) | 1 line Updated documentation for SysLogHandler (#1720726). ........ r55592 | brett.cannon | 2007-05-25 13:17:15 -0700 (Fri, 25 May 2007) | 3 lines Remove direct call's to file's constructor and replace them with calls to open() as ths is considered best practice. ........ r55601 | kristjan.jonsson | 2007-05-26 12:19:50 -0700 (Sat, 26 May 2007) | 1 line Remove the rgbimgmodule from PCBuild8 ........ r55602 | kristjan.jonsson | 2007-05-26 12:31:39 -0700 (Sat, 26 May 2007) | 1 line Include <windows.h> after python.h, so that WINNT is properly set before windows.h is included. Fixes warnings in PC builds. ........ r55603 | walter.doerwald | 2007-05-26 14:04:13 -0700 (Sat, 26 May 2007) | 2 lines Fix typo. ........ r55604 | peter.astrand | 2007-05-26 15:18:20 -0700 (Sat, 26 May 2007) | 1 line Applied patch 1669481, slightly modified: Support close_fds on Win32 ........ r55606 | neal.norwitz | 2007-05-26 21:08:54 -0700 (Sat, 26 May 2007) | 2 lines Add the new function object attribute names from py3k. ........ r55617 | lars.gustaebel | 2007-05-27 12:49:30 -0700 (Sun, 27 May 2007) | 20 lines Added errors argument to TarFile class that allows the user to specify an error handling scheme for character conversion. Additional scheme "utf-8" in read mode. Unicode input filenames are now supported by design. The values of the pax_headers dictionary are now limited to unicode objects. Fixed: The prefix field is no longer used in PAX_FORMAT (in conformance with POSIX). Fixed: In read mode use a possible pax header size field. Fixed: Strip trailing slashes from pax header name values. Fixed: Give values in user-specified pax_headers precedence when writing. Added unicode tests. Added pax/regtype4 member to testtar.tar all possible number fields in a pax header. Added two chapters to the documentation about the different formats tarfile.py supports and how unicode issues are handled. ........ r55618 | raymond.hettinger | 2007-05-27 22:23:22 -0700 (Sun, 27 May 2007) | 1 line Explain when groupby() issues a new group. ........ r55634 | martin.v.loewis | 2007-05-28 21:01:29 -0700 (Mon, 28 May 2007) | 2 lines Test pre-commit hook for a link to a .py file. ........ r55635 | martin.v.loewis | 2007-05-28 21:02:03 -0700 (Mon, 28 May 2007) | 2 lines Revert 55634. ........ ................ r55639 | neal.norwitz | 2007-05-29 00:58:11 -0700 (Tue, 29 May 2007) | 1 line Remove sys.exc_{type,exc_value,exc_traceback} ................ r55641 | neal.norwitz | 2007-05-29 01:03:50 -0700 (Tue, 29 May 2007) | 1 line Missed one sys.exc_type. I wonder why exc_{value,traceback} were already gone ................ r55642 | neal.norwitz | 2007-05-29 01:08:33 -0700 (Tue, 29 May 2007) | 1 line Missed more doc for sys.exc_* attrs. ................ r55643 | neal.norwitz | 2007-05-29 01:18:19 -0700 (Tue, 29 May 2007) | 1 line Remove sys.exc_clear() ................ r55665 | guido.van.rossum | 2007-05-29 19:45:43 -0700 (Tue, 29 May 2007) | 4 lines Make None, True, False keywords. We can now also delete all the other places that explicitly forbid assignment to None, but I'm not going to bother right now. ................ r55666 | guido.van.rossum | 2007-05-29 20:01:51 -0700 (Tue, 29 May 2007) | 3 lines Found another place that needs check for forbidden names. Fixed test_syntax.py accordingly (it helped me find that one). ................ r55668 | guido.van.rossum | 2007-05-29 20:41:48 -0700 (Tue, 29 May 2007) | 2 lines Mark None, True, False as keywords. ................ r55673 | neal.norwitz | 2007-05-29 23:28:25 -0700 (Tue, 29 May 2007) | 3 lines Get the dis module working on modules again after changing dicts to not return lists and also new-style classes. Add a test. ................ r55674 | neal.norwitz | 2007-05-29 23:35:45 -0700 (Tue, 29 May 2007) | 1 line Umm, it helps to add the module that the test uses ................ r55675 | neal.norwitz | 2007-05-29 23:53:05 -0700 (Tue, 29 May 2007) | 4 lines Try to fix up all the other places that were assigning to True/False. There's at least one more problem in test.test_xmlrpc. I have other changes in that file and that should be fixed soon (I hope). ................ r55679 | neal.norwitz | 2007-05-30 00:31:55 -0700 (Wed, 30 May 2007) | 1 line Fix up another place that was assigning to True/False. ................ r55688 | brett.cannon | 2007-05-30 14:19:47 -0700 (Wed, 30 May 2007) | 2 lines Ditch MimeWriter. ................ r55692 | brett.cannon | 2007-05-30 14:52:00 -0700 (Wed, 30 May 2007) | 2 lines Remove the mimify module. ................ r55707 | guido.van.rossum | 2007-05-31 05:08:45 -0700 (Thu, 31 May 2007) | 2 lines Backport the addition of show_code() to dis.py -- it's too handy. ................ r55708 | guido.van.rossum | 2007-05-31 06:22:57 -0700 (Thu, 31 May 2007) | 7 lines Fix a fairly long-standing bug in the check for assignment to None (and other keywords, these days). In 2.5, you could write foo(None=1) without getting a SyntaxError (although foo()'s definition would have to use **kwds to avoid getting a runtime error complaining about an unknown keyword of course). This ought to be backported to 2.5.2 or at least 2.6. ................ r55724 | brett.cannon | 2007-05-31 19:32:41 -0700 (Thu, 31 May 2007) | 2 lines Remove the cfmfile. ................ r55727 | neal.norwitz | 2007-05-31 22:19:44 -0700 (Thu, 31 May 2007) | 1 line Remove reload() builtin. ................ r55729 | neal.norwitz | 2007-05-31 22:51:30 -0700 (Thu, 31 May 2007) | 59 lines Merged revisions 55636-55728 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55637 | georg.brandl | 2007-05-29 00:16:47 -0700 (Tue, 29 May 2007) | 2 lines Fix rst markup. ........ r55638 | neal.norwitz | 2007-05-29 00:51:39 -0700 (Tue, 29 May 2007) | 1 line Fix typo in doc ........ r55671 | neal.norwitz | 2007-05-29 21:53:41 -0700 (Tue, 29 May 2007) | 1 line Fix indentation (whitespace only). ........ r55676 | thomas.heller | 2007-05-29 23:58:30 -0700 (Tue, 29 May 2007) | 1 line Fix compiler warnings. ........ r55677 | thomas.heller | 2007-05-30 00:01:25 -0700 (Wed, 30 May 2007) | 2 lines Correct the name of a field in the WIN32_FIND_DATAA and WIN32_FIND_DATAW structures. Closes bug #1726026. ........ r55686 | brett.cannon | 2007-05-30 13:46:26 -0700 (Wed, 30 May 2007) | 2 lines Have MimeWriter raise a DeprecationWarning as per PEP 4 and its documentation. ........ r55690 | brett.cannon | 2007-05-30 14:48:58 -0700 (Wed, 30 May 2007) | 3 lines Have mimify raise a DeprecationWarning. The docs and PEP 4 have listed the module as deprecated for a while. ........ r55696 | brett.cannon | 2007-05-30 15:24:28 -0700 (Wed, 30 May 2007) | 2 lines Have md5 raise a DeprecationWarning as per PEP 4. ........ r55705 | neal.norwitz | 2007-05-30 21:14:22 -0700 (Wed, 30 May 2007) | 1 line Add some spaces in the example code. ........ r55716 | brett.cannon | 2007-05-31 12:20:00 -0700 (Thu, 31 May 2007) | 2 lines Have the sha module raise a DeprecationWarning as specified in PEP 4. ........ r55719 | brett.cannon | 2007-05-31 12:40:42 -0700 (Thu, 31 May 2007) | 2 lines Cause buildtools to raise a DeprecationWarning. ........ r55721 | brett.cannon | 2007-05-31 13:01:11 -0700 (Thu, 31 May 2007) | 2 lines Have cfmfile raise a DeprecationWarning as per PEP 4. ........ r55726 | neal.norwitz | 2007-05-31 21:56:47 -0700 (Thu, 31 May 2007) | 1 line Mail if there is an installation failure. ........ ................ r55730 | neal.norwitz | 2007-05-31 23:22:07 -0700 (Thu, 31 May 2007) | 2 lines Remove the code that was missed in rev 55303. ................ r55738 | neal.norwitz | 2007-06-01 19:10:43 -0700 (Fri, 01 Jun 2007) | 1 line Fix doc breakage ................ r55741 | neal.norwitz | 2007-06-02 00:41:58 -0700 (Sat, 02 Jun 2007) | 1 line Remove timing module (plus some remnants of other modules). ................ r55742 | neal.norwitz | 2007-06-02 00:51:44 -0700 (Sat, 02 Jun 2007) | 1 line Remove posixfile module (plus some remnants of other modules). ................ r55744 | neal.norwitz | 2007-06-02 10:18:56 -0700 (Sat, 02 Jun 2007) | 1 line Fix doc breakage. ................ r55745 | neal.norwitz | 2007-06-02 11:32:16 -0700 (Sat, 02 Jun 2007) | 1 line Make a whatsnew 3.0 template. ................ r55754 | neal.norwitz | 2007-06-03 23:24:18 -0700 (Sun, 03 Jun 2007) | 1 line SF #1730441, os._execvpe raises UnboundLocal due to new try/except semantics ................ r55755 | neal.norwitz | 2007-06-03 23:26:00 -0700 (Sun, 03 Jun 2007) | 1 line Get rid of extra whitespace ................ r55794 | guido.van.rossum | 2007-06-06 15:29:22 -0700 (Wed, 06 Jun 2007) | 3 lines Make this compile in GCC 2.96, which does not allow interspersing declarations and code. ................
516 lines
17 KiB
Python
516 lines
17 KiB
Python
"""Import hook support.
|
|
|
|
Consistent use of this module will make it possible to change the
|
|
different mechanisms involved in loading modules independently.
|
|
|
|
While the built-in module imp exports interfaces to the built-in
|
|
module searching and loading algorithm, and it is possible to replace
|
|
the built-in function __import__ in order to change the semantics of
|
|
the import statement, until now it has been difficult to combine the
|
|
effect of different __import__ hacks, like loading modules from URLs
|
|
by rimport.py.
|
|
|
|
This module defines three new concepts:
|
|
|
|
1) A "file system hooks" class provides an interface to a filesystem.
|
|
|
|
One hooks class is defined (Hooks), which uses the interface provided
|
|
by standard modules os and os.path. It should be used as the base
|
|
class for other hooks classes.
|
|
|
|
2) A "module loader" class provides an interface to search for a
|
|
module in a search path and to load it. It defines a method which
|
|
searches for a module in a single directory; by overriding this method
|
|
one can redefine the details of the search. If the directory is None,
|
|
built-in and frozen modules are searched instead.
|
|
|
|
Two module loader class are defined, both implementing the search
|
|
strategy used by the built-in __import__ function: ModuleLoader uses
|
|
the imp module's find_module interface, while HookableModuleLoader
|
|
uses a file system hooks class to interact with the file system. Both
|
|
use the imp module's load_* interfaces to actually load the module.
|
|
|
|
3) A "module importer" class provides an interface to import a
|
|
module, as well as interfaces to reload and unload a module. It also
|
|
provides interfaces to install and uninstall itself instead of the
|
|
default __import__ and reload (and unload) functions.
|
|
|
|
One module importer class is defined (ModuleImporter), which uses a
|
|
module loader instance passed in (by default HookableModuleLoader is
|
|
instantiated).
|
|
|
|
The classes defined here should be used as base classes for extended
|
|
functionality along those lines.
|
|
|
|
If a module importer class supports dotted names, its import_module()
|
|
must return a different value depending on whether it is called on
|
|
behalf of a "from ... import ..." statement or not. (This is caused
|
|
by the way the __import__ hook is used by the Python interpreter.)
|
|
"""
|
|
|
|
|
|
import __builtin__
|
|
import imp
|
|
import os
|
|
import sys
|
|
|
|
__all__ = ["BasicModuleLoader","Hooks","ModuleLoader","FancyModuleLoader",
|
|
"BasicModuleImporter","ModuleImporter","install","uninstall"]
|
|
|
|
VERBOSE = 0
|
|
|
|
|
|
from imp import C_EXTENSION, PY_SOURCE, PY_COMPILED
|
|
from imp import C_BUILTIN, PY_FROZEN, PKG_DIRECTORY
|
|
BUILTIN_MODULE = C_BUILTIN
|
|
FROZEN_MODULE = PY_FROZEN
|
|
|
|
|
|
class _Verbose:
|
|
|
|
def __init__(self, verbose = VERBOSE):
|
|
self.verbose = verbose
|
|
|
|
def get_verbose(self):
|
|
return self.verbose
|
|
|
|
def set_verbose(self, verbose):
|
|
self.verbose = verbose
|
|
|
|
# XXX The following is an experimental interface
|
|
|
|
def note(self, *args):
|
|
if self.verbose:
|
|
self.message(*args)
|
|
|
|
def message(self, format, *args):
|
|
if args:
|
|
print(format%args)
|
|
else:
|
|
print(format)
|
|
|
|
|
|
class BasicModuleLoader(_Verbose):
|
|
|
|
"""Basic module loader.
|
|
|
|
This provides the same functionality as built-in import. It
|
|
doesn't deal with checking sys.modules -- all it provides is
|
|
find_module() and a load_module(), as well as find_module_in_dir()
|
|
which searches just one directory, and can be overridden by a
|
|
derived class to change the module search algorithm when the basic
|
|
dependency on sys.path is unchanged.
|
|
|
|
The interface is a little more convenient than imp's:
|
|
find_module(name, [path]) returns None or 'stuff', and
|
|
load_module(name, stuff) loads the module.
|
|
|
|
"""
|
|
|
|
def find_module(self, name, path = None):
|
|
if path is None:
|
|
path = [None] + self.default_path()
|
|
for dir in path:
|
|
stuff = self.find_module_in_dir(name, dir)
|
|
if stuff: return stuff
|
|
return None
|
|
|
|
def default_path(self):
|
|
return sys.path
|
|
|
|
def find_module_in_dir(self, name, dir):
|
|
if dir is None:
|
|
return self.find_builtin_module(name)
|
|
else:
|
|
try:
|
|
return imp.find_module(name, [dir])
|
|
except ImportError:
|
|
return None
|
|
|
|
def find_builtin_module(self, name):
|
|
# XXX frozen packages?
|
|
if imp.is_builtin(name):
|
|
return None, '', ('', '', BUILTIN_MODULE)
|
|
if imp.is_frozen(name):
|
|
return None, '', ('', '', FROZEN_MODULE)
|
|
return None
|
|
|
|
def load_module(self, name, stuff):
|
|
file, filename, info = stuff
|
|
try:
|
|
return imp.load_module(name, file, filename, info)
|
|
finally:
|
|
if file: file.close()
|
|
|
|
|
|
class Hooks(_Verbose):
|
|
|
|
"""Hooks into the filesystem and interpreter.
|
|
|
|
By deriving a subclass you can redefine your filesystem interface,
|
|
e.g. to merge it with the URL space.
|
|
|
|
This base class behaves just like the native filesystem.
|
|
|
|
"""
|
|
|
|
# imp interface
|
|
def get_suffixes(self): return imp.get_suffixes()
|
|
def new_module(self, name): return imp.new_module(name)
|
|
def is_builtin(self, name): return imp.is_builtin(name)
|
|
def init_builtin(self, name): return imp.init_builtin(name)
|
|
def is_frozen(self, name): return imp.is_frozen(name)
|
|
def init_frozen(self, name): return imp.init_frozen(name)
|
|
def get_frozen_object(self, name): return imp.get_frozen_object(name)
|
|
def load_source(self, name, filename, file=None):
|
|
return imp.load_source(name, filename, file)
|
|
def load_compiled(self, name, filename, file=None):
|
|
return imp.load_compiled(name, filename, file)
|
|
def load_dynamic(self, name, filename, file=None):
|
|
return imp.load_dynamic(name, filename, file)
|
|
def load_package(self, name, filename, file=None):
|
|
return imp.load_module(name, file, filename, ("", "", PKG_DIRECTORY))
|
|
|
|
def add_module(self, name):
|
|
d = self.modules_dict()
|
|
if name in d: return d[name]
|
|
d[name] = m = self.new_module(name)
|
|
return m
|
|
|
|
# sys interface
|
|
def modules_dict(self): return sys.modules
|
|
def default_path(self): return sys.path
|
|
|
|
def path_split(self, x): return os.path.split(x)
|
|
def path_join(self, x, y): return os.path.join(x, y)
|
|
def path_isabs(self, x): return os.path.isabs(x)
|
|
# etc.
|
|
|
|
def path_exists(self, x): return os.path.exists(x)
|
|
def path_isdir(self, x): return os.path.isdir(x)
|
|
def path_isfile(self, x): return os.path.isfile(x)
|
|
def path_islink(self, x): return os.path.islink(x)
|
|
# etc.
|
|
|
|
def openfile(self, *x): return open(*x)
|
|
openfile_error = IOError
|
|
def listdir(self, x): return os.listdir(x)
|
|
listdir_error = os.error
|
|
# etc.
|
|
|
|
|
|
class ModuleLoader(BasicModuleLoader):
|
|
|
|
"""Default module loader; uses file system hooks.
|
|
|
|
By defining suitable hooks, you might be able to load modules from
|
|
other sources than the file system, e.g. from compressed or
|
|
encrypted files, tar files or (if you're brave!) URLs.
|
|
|
|
"""
|
|
|
|
def __init__(self, hooks = None, verbose = VERBOSE):
|
|
BasicModuleLoader.__init__(self, verbose)
|
|
self.hooks = hooks or Hooks(verbose)
|
|
|
|
def default_path(self):
|
|
return self.hooks.default_path()
|
|
|
|
def modules_dict(self):
|
|
return self.hooks.modules_dict()
|
|
|
|
def get_hooks(self):
|
|
return self.hooks
|
|
|
|
def set_hooks(self, hooks):
|
|
self.hooks = hooks
|
|
|
|
def find_builtin_module(self, name):
|
|
# XXX frozen packages?
|
|
if self.hooks.is_builtin(name):
|
|
return None, '', ('', '', BUILTIN_MODULE)
|
|
if self.hooks.is_frozen(name):
|
|
return None, '', ('', '', FROZEN_MODULE)
|
|
return None
|
|
|
|
def find_module_in_dir(self, name, dir, allow_packages=1):
|
|
if dir is None:
|
|
return self.find_builtin_module(name)
|
|
if allow_packages:
|
|
fullname = self.hooks.path_join(dir, name)
|
|
if self.hooks.path_isdir(fullname):
|
|
stuff = self.find_module_in_dir("__init__", fullname, 0)
|
|
if stuff:
|
|
file = stuff[0]
|
|
if file: file.close()
|
|
return None, fullname, ('', '', PKG_DIRECTORY)
|
|
for info in self.hooks.get_suffixes():
|
|
suff, mode, type = info
|
|
fullname = self.hooks.path_join(dir, name+suff)
|
|
try:
|
|
fp = self.hooks.openfile(fullname, mode)
|
|
return fp, fullname, info
|
|
except self.hooks.openfile_error:
|
|
pass
|
|
return None
|
|
|
|
def load_module(self, name, stuff):
|
|
file, filename, info = stuff
|
|
(suff, mode, type) = info
|
|
try:
|
|
if type == BUILTIN_MODULE:
|
|
return self.hooks.init_builtin(name)
|
|
if type == FROZEN_MODULE:
|
|
return self.hooks.init_frozen(name)
|
|
if type == C_EXTENSION:
|
|
m = self.hooks.load_dynamic(name, filename, file)
|
|
elif type == PY_SOURCE:
|
|
m = self.hooks.load_source(name, filename, file)
|
|
elif type == PY_COMPILED:
|
|
m = self.hooks.load_compiled(name, filename, file)
|
|
elif type == PKG_DIRECTORY:
|
|
m = self.hooks.load_package(name, filename, file)
|
|
else:
|
|
raise ImportError, "Unrecognized module type (%r) for %s" % \
|
|
(type, name)
|
|
finally:
|
|
if file: file.close()
|
|
m.__file__ = filename
|
|
return m
|
|
|
|
|
|
class FancyModuleLoader(ModuleLoader):
|
|
|
|
"""Fancy module loader -- parses and execs the code itself."""
|
|
|
|
def load_module(self, name, stuff):
|
|
file, filename, (suff, mode, type) = stuff
|
|
realfilename = filename
|
|
path = None
|
|
|
|
if type == PKG_DIRECTORY:
|
|
initstuff = self.find_module_in_dir("__init__", filename, 0)
|
|
if not initstuff:
|
|
raise ImportError, "No __init__ module in package %s" % name
|
|
initfile, initfilename, initinfo = initstuff
|
|
initsuff, initmode, inittype = initinfo
|
|
if inittype not in (PY_COMPILED, PY_SOURCE):
|
|
if initfile: initfile.close()
|
|
raise ImportError, \
|
|
"Bad type (%r) for __init__ module in package %s" % (
|
|
inittype, name)
|
|
path = [filename]
|
|
file = initfile
|
|
realfilename = initfilename
|
|
type = inittype
|
|
|
|
if type == FROZEN_MODULE:
|
|
code = self.hooks.get_frozen_object(name)
|
|
elif type == PY_COMPILED:
|
|
import marshal
|
|
file.seek(8)
|
|
code = marshal.load(file)
|
|
elif type == PY_SOURCE:
|
|
data = file.read()
|
|
code = compile(data, realfilename, 'exec')
|
|
else:
|
|
return ModuleLoader.load_module(self, name, stuff)
|
|
|
|
m = self.hooks.add_module(name)
|
|
if path:
|
|
m.__path__ = path
|
|
m.__file__ = filename
|
|
try:
|
|
exec(code, m.__dict__)
|
|
except:
|
|
d = self.hooks.modules_dict()
|
|
if name in d:
|
|
del d[name]
|
|
raise
|
|
return m
|
|
|
|
|
|
class BasicModuleImporter(_Verbose):
|
|
|
|
"""Basic module importer; uses module loader.
|
|
|
|
This provides basic import facilities but no package imports.
|
|
|
|
"""
|
|
|
|
def __init__(self, loader = None, verbose = VERBOSE):
|
|
_Verbose.__init__(self, verbose)
|
|
self.loader = loader or ModuleLoader(None, verbose)
|
|
self.modules = self.loader.modules_dict()
|
|
|
|
def get_loader(self):
|
|
return self.loader
|
|
|
|
def set_loader(self, loader):
|
|
self.loader = loader
|
|
|
|
def get_hooks(self):
|
|
return self.loader.get_hooks()
|
|
|
|
def set_hooks(self, hooks):
|
|
return self.loader.set_hooks(hooks)
|
|
|
|
def import_module(self, name, globals={}, locals={}, fromlist=[]):
|
|
name = str(name)
|
|
if name in self.modules:
|
|
return self.modules[name] # Fast path
|
|
stuff = self.loader.find_module(name)
|
|
if not stuff:
|
|
raise ImportError, "No module named %s" % name
|
|
return self.loader.load_module(name, stuff)
|
|
|
|
def reload(self, module, path = None):
|
|
name = str(module.__name__)
|
|
stuff = self.loader.find_module(name, path)
|
|
if not stuff:
|
|
raise ImportError, "Module %s not found for reload" % name
|
|
return self.loader.load_module(name, stuff)
|
|
|
|
def unload(self, module):
|
|
del self.modules[str(module.__name__)]
|
|
# XXX Should this try to clear the module's namespace?
|
|
|
|
def install(self):
|
|
self.save_import_module = __builtin__.__import__
|
|
if not hasattr(__builtin__, 'unload'):
|
|
__builtin__.unload = None
|
|
self.save_unload = __builtin__.unload
|
|
__builtin__.__import__ = self.import_module
|
|
__builtin__.unload = self.unload
|
|
|
|
def uninstall(self):
|
|
__builtin__.__import__ = self.save_import_module
|
|
__builtin__.unload = self.save_unload
|
|
if not __builtin__.unload:
|
|
del __builtin__.unload
|
|
|
|
|
|
class ModuleImporter(BasicModuleImporter):
|
|
|
|
"""A module importer that supports packages."""
|
|
|
|
def import_module(self, name, globals=None, locals=None, fromlist=None):
|
|
parent = self.determine_parent(globals)
|
|
q, tail = self.find_head_package(parent, str(name))
|
|
m = self.load_tail(q, tail)
|
|
if not fromlist:
|
|
return q
|
|
if hasattr(m, "__path__"):
|
|
self.ensure_fromlist(m, fromlist)
|
|
return m
|
|
|
|
def determine_parent(self, globals):
|
|
if not globals or not "__name__" in globals:
|
|
return None
|
|
pname = globals['__name__']
|
|
if "__path__" in globals:
|
|
parent = self.modules[pname]
|
|
assert globals is parent.__dict__
|
|
return parent
|
|
if '.' in pname:
|
|
i = pname.rfind('.')
|
|
pname = pname[:i]
|
|
parent = self.modules[pname]
|
|
assert parent.__name__ == pname
|
|
return parent
|
|
return None
|
|
|
|
def find_head_package(self, parent, name):
|
|
if '.' in name:
|
|
i = name.find('.')
|
|
head = name[:i]
|
|
tail = name[i+1:]
|
|
else:
|
|
head = name
|
|
tail = ""
|
|
if parent:
|
|
qname = "%s.%s" % (parent.__name__, head)
|
|
else:
|
|
qname = head
|
|
q = self.import_it(head, qname, parent)
|
|
if q: return q, tail
|
|
if parent:
|
|
qname = head
|
|
parent = None
|
|
q = self.import_it(head, qname, parent)
|
|
if q: return q, tail
|
|
raise ImportError, "No module named " + qname
|
|
|
|
def load_tail(self, q, tail):
|
|
m = q
|
|
while tail:
|
|
i = tail.find('.')
|
|
if i < 0: i = len(tail)
|
|
head, tail = tail[:i], tail[i+1:]
|
|
mname = "%s.%s" % (m.__name__, head)
|
|
m = self.import_it(head, mname, m)
|
|
if not m:
|
|
raise ImportError, "No module named " + mname
|
|
return m
|
|
|
|
def ensure_fromlist(self, m, fromlist, recursive=0):
|
|
for sub in fromlist:
|
|
if sub == "*":
|
|
if not recursive:
|
|
try:
|
|
all = m.__all__
|
|
except AttributeError:
|
|
pass
|
|
else:
|
|
self.ensure_fromlist(m, all, 1)
|
|
continue
|
|
if sub != "*" and not hasattr(m, sub):
|
|
subname = "%s.%s" % (m.__name__, sub)
|
|
submod = self.import_it(sub, subname, m)
|
|
if not submod:
|
|
raise ImportError, "No module named " + subname
|
|
|
|
def import_it(self, partname, fqname, parent, force_load=0):
|
|
if not partname:
|
|
raise ValueError, "Empty module name"
|
|
if not force_load:
|
|
try:
|
|
return self.modules[fqname]
|
|
except KeyError:
|
|
pass
|
|
try:
|
|
path = parent and parent.__path__
|
|
except AttributeError:
|
|
return None
|
|
partname = str(partname)
|
|
stuff = self.loader.find_module(partname, path)
|
|
if not stuff:
|
|
return None
|
|
fqname = str(fqname)
|
|
m = self.loader.load_module(fqname, stuff)
|
|
if parent:
|
|
setattr(parent, partname, m)
|
|
return m
|
|
|
|
def reload(self, module):
|
|
name = str(module.__name__)
|
|
if '.' not in name:
|
|
return self.import_it(name, name, None, force_load=1)
|
|
i = name.rfind('.')
|
|
pname = name[:i]
|
|
parent = self.modules[pname]
|
|
return self.import_it(name[i+1:], name, parent, force_load=1)
|
|
|
|
|
|
default_importer = None
|
|
current_importer = None
|
|
|
|
def install(importer = None):
|
|
global current_importer
|
|
current_importer = importer or default_importer or ModuleImporter()
|
|
current_importer.install()
|
|
|
|
def uninstall():
|
|
global current_importer
|
|
current_importer.uninstall()
|