mirror of
https://github.com/python/cpython.git
synced 2024-12-12 03:04:15 +08:00
cd16bf6404
svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r55837 | guido.van.rossum | 2007-06-08 16:04:42 -0700 (Fri, 08 Jun 2007) | 2 lines PEP 3119 -- the abc module. ................ r55838 | guido.van.rossum | 2007-06-08 17:38:55 -0700 (Fri, 08 Jun 2007) | 2 lines Implement part of PEP 3119 -- One Trick Ponies. ................ r55847 | guido.van.rossum | 2007-06-09 08:28:06 -0700 (Sat, 09 Jun 2007) | 2 lines Different way to do one trick ponies, allowing registration (per PEP strawman). ................ r55849 | guido.van.rossum | 2007-06-09 18:06:38 -0700 (Sat, 09 Jun 2007) | 3 lines Make sure that the magic looking for __hash__ (etc.) doesn't apply to real subclasses of Hashable. ................ r55852 | guido.van.rossum | 2007-06-10 08:29:51 -0700 (Sun, 10 Jun 2007) | 2 lines Add some more examples, e.g. generators and dict views. ................ r55853 | guido.van.rossum | 2007-06-10 08:31:59 -0700 (Sun, 10 Jun 2007) | 2 lines keys() and items() *are* containers -- just values() isn't. ................ r55864 | georg.brandl | 2007-06-10 15:29:40 -0700 (Sun, 10 Jun 2007) | 2 lines PEP 3127: new octal literals, binary literals. ................ r55865 | georg.brandl | 2007-06-10 15:31:37 -0700 (Sun, 10 Jun 2007) | 2 lines Some octal literal fixes in Tools. ................ r55866 | georg.brandl | 2007-06-10 15:37:43 -0700 (Sun, 10 Jun 2007) | 2 lines Tokenizer changes for PEP 3127. ................ r55867 | georg.brandl | 2007-06-10 15:37:55 -0700 (Sun, 10 Jun 2007) | 2 lines Some docs for PEP 3127. ................ r55868 | georg.brandl | 2007-06-10 15:44:39 -0700 (Sun, 10 Jun 2007) | 2 lines Missed a place in intobject.c. Is that used anymore anyway? ................ r55871 | neal.norwitz | 2007-06-10 18:31:49 -0700 (Sun, 10 Jun 2007) | 182 lines Merged revisions 55729-55868 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55731 | neal.norwitz | 2007-06-01 00:29:12 -0700 (Fri, 01 Jun 2007) | 7 lines SF 1668596/1720897: distutils now copies data files even if package_dir is empty. This needs to be backported. I'm too tired tonight. It would be great if someone backports this if the buildbots are ok with it. Otherwise, I will try to get to it tomorrow. ........ r55732 | georg.brandl | 2007-06-01 04:33:33 -0700 (Fri, 01 Jun 2007) | 2 lines Bug #1722484: remove docstrings again when running with -OO. ........ r55735 | georg.brandl | 2007-06-01 12:20:27 -0700 (Fri, 01 Jun 2007) | 2 lines Fix wrong issue number. ........ r55739 | brett.cannon | 2007-06-01 20:02:29 -0700 (Fri, 01 Jun 2007) | 3 lines Have configure raise an error when building on AtheOS. Code specific to AtheOS will be removed in Python 2.7. ........ r55746 | neal.norwitz | 2007-06-02 11:33:53 -0700 (Sat, 02 Jun 2007) | 1 line Update expected birthday of 2.6 ........ r55751 | neal.norwitz | 2007-06-03 13:32:50 -0700 (Sun, 03 Jun 2007) | 10 lines Backout the original 'fix' to 1721309 which had no effect. Different versions of Berkeley DB handle this differently. The comments and bug report should have the details. Memory is allocated in 4.4 (and presumably earlier), but not in 4.5. Thus 4.5 has the free error, but not earlier versions. Mostly update comments, plus make the free conditional. This fix was already applied to the 2.5 branch. ........ r55752 | brett.cannon | 2007-06-03 16:13:41 -0700 (Sun, 03 Jun 2007) | 6 lines Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead of ``\s*``. This prevents patterns from "stealing" bits from other patterns in order to make a match work. Closes bug #1730389. Will be backported. ........ r55766 | hyeshik.chang | 2007-06-05 11:16:52 -0700 (Tue, 05 Jun 2007) | 4 lines Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different from Linux's. Just fix the build for now but the code doesn't support the complete capability of HCI on FreeBSD yet. ........ r55770 | hyeshik.chang | 2007-06-05 11:58:51 -0700 (Tue, 05 Jun 2007) | 4 lines Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it reads a file that ends with incomplete sequence and sizehint argument for .read() is specified. ........ r55775 | hyeshik.chang | 2007-06-05 12:28:15 -0700 (Tue, 05 Jun 2007) | 2 lines Fix for Windows: close a temporary file before trying to delete it. ........ r55783 | guido.van.rossum | 2007-06-05 14:24:47 -0700 (Tue, 05 Jun 2007) | 2 lines Patch by Tim Delany (missing DECREF). SF #1731330. ........ r55785 | collin.winter | 2007-06-05 17:17:35 -0700 (Tue, 05 Jun 2007) | 3 lines Patch #1731049: make threading.py use a proper "raise" when checking internal state, rather than assert statements (which get stripped out by -O). ........ r55786 | facundo.batista | 2007-06-06 08:13:37 -0700 (Wed, 06 Jun 2007) | 4 lines FTP.ntransfercmd method now uses create_connection when passive, using the timeout received in connection time. ........ r55792 | facundo.batista | 2007-06-06 10:15:23 -0700 (Wed, 06 Jun 2007) | 7 lines Added an optional timeout parameter to function urllib2.urlopen, with tests in test_urllib2net.py (must have network resource enabled to execute them). Also modified test_urllib2.py because testing mock classes must take it into acount. Docs are also updated. ........ r55793 | thomas.heller | 2007-06-06 13:19:19 -0700 (Wed, 06 Jun 2007) | 1 line Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration. ........ r55802 | georg.brandl | 2007-06-07 06:23:24 -0700 (Thu, 07 Jun 2007) | 3 lines Disallow function calls like foo(None=1). Backport from py3k rev. 55708 by Guido. ........ r55804 | georg.brandl | 2007-06-07 06:30:24 -0700 (Thu, 07 Jun 2007) | 2 lines Make reindent.py executable. ........ r55805 | georg.brandl | 2007-06-07 06:34:10 -0700 (Thu, 07 Jun 2007) | 2 lines Patch #1667860: Fix UnboundLocalError in urllib2. ........ r55821 | kristjan.jonsson | 2007-06-07 16:53:49 -0700 (Thu, 07 Jun 2007) | 1 line Fixing changes to getbuildinfo.c that broke linux builds ........ r55828 | thomas.heller | 2007-06-08 09:10:27 -0700 (Fri, 08 Jun 2007) | 1 line Make this test work with older Python releases where struct has no 't' format character. ........ r55829 | martin.v.loewis | 2007-06-08 10:29:20 -0700 (Fri, 08 Jun 2007) | 3 lines Bug #1733488: Fix compilation of bufferobject.c on AIX. Will backport to 2.5. ........ r55831 | thomas.heller | 2007-06-08 11:20:09 -0700 (Fri, 08 Jun 2007) | 2 lines [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur with small modifications. ........ r55832 | thomas.heller | 2007-06-08 12:01:06 -0700 (Fri, 08 Jun 2007) | 1 line Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls. ........ r55833 | thomas.heller | 2007-06-08 12:08:31 -0700 (Fri, 08 Jun 2007) | 2 lines Fix wrong documentation, and correct the punktuation. Closes [1700455]. ........ r55834 | thomas.heller | 2007-06-08 12:14:23 -0700 (Fri, 08 Jun 2007) | 1 line Fix warnings by using proper function prototype. ........ r55839 | neal.norwitz | 2007-06-08 20:36:34 -0700 (Fri, 08 Jun 2007) | 7 lines Prevent expandtabs() on string and unicode objects from causing a segfault when a large width is passed on 32-bit platforms. Found by Google. It would be good for people to review this especially carefully and verify I don't have an off by one error and there is no other way to cause overflow. ........ r55841 | neal.norwitz | 2007-06-08 21:48:22 -0700 (Fri, 08 Jun 2007) | 1 line Use macro version of GET_SIZE to avoid Coverity warning (#150) about a possible error. ........ r55842 | martin.v.loewis | 2007-06-09 00:42:52 -0700 (Sat, 09 Jun 2007) | 3 lines Patch #1733960: Allow T_LONGLONG to accept ints. Will backport to 2.5. ........ r55843 | martin.v.loewis | 2007-06-09 00:58:05 -0700 (Sat, 09 Jun 2007) | 2 lines Fix Windows build. ........ r55845 | martin.v.loewis | 2007-06-09 03:10:26 -0700 (Sat, 09 Jun 2007) | 2 lines Provide LLONG_MAX for S390. ........ r55854 | thomas.heller | 2007-06-10 08:59:17 -0700 (Sun, 10 Jun 2007) | 4 lines First version of build scripts for Windows/AMD64 (no external components are built yet, and 'kill_python' is disabled). ........ r55855 | thomas.heller | 2007-06-10 10:55:51 -0700 (Sun, 10 Jun 2007) | 3 lines For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter modules in the ReleaseAMD64 configuration because they do not compile. ........ r55856 | thomas.heller | 2007-06-10 11:27:54 -0700 (Sun, 10 Jun 2007) | 1 line Need to set the environment variables, otherwise devenv.com is not found. ........ r55860 | thomas.heller | 2007-06-10 14:01:17 -0700 (Sun, 10 Jun 2007) | 1 line Revert commit 55855. ........ ................ r55880 | neal.norwitz | 2007-06-10 22:07:36 -0700 (Sun, 10 Jun 2007) | 5 lines Fix the refleak counter on test_collections. The ABC metaclass creates a registry which must be cleared on each run. Otherwise, there *seem* to be refleaks when there really aren't any. (The class is held within the registry even though it's no longer needed.) ................ r55884 | neal.norwitz | 2007-06-10 22:46:33 -0700 (Sun, 10 Jun 2007) | 1 line These tests have been removed, so they are no longer needed here ................ r55886 | georg.brandl | 2007-06-11 00:26:37 -0700 (Mon, 11 Jun 2007) | 3 lines Optimize access to True and False in the compiler (if True) and the peepholer (LOAD_NAME True). ................ r55905 | georg.brandl | 2007-06-11 10:02:26 -0700 (Mon, 11 Jun 2007) | 5 lines Remove __oct__ and __hex__ and use __index__ for converting non-ints before formatting in a base. Add a bin() builtin. ................ r55906 | georg.brandl | 2007-06-11 10:04:44 -0700 (Mon, 11 Jun 2007) | 2 lines int(x, 0) does not "guess". ................ r55907 | georg.brandl | 2007-06-11 10:05:47 -0700 (Mon, 11 Jun 2007) | 2 lines Add a comment to explain that nb_oct and nb_hex are nonfunctional. ................ r55908 | guido.van.rossum | 2007-06-11 10:49:18 -0700 (Mon, 11 Jun 2007) | 2 lines Get rid of unused imports and comment. ................ r55910 | guido.van.rossum | 2007-06-11 13:05:17 -0700 (Mon, 11 Jun 2007) | 2 lines _Abstract.__new__ now requires either no arguments or __init__ overridden. ................ r55911 | guido.van.rossum | 2007-06-11 13:07:49 -0700 (Mon, 11 Jun 2007) | 7 lines Move the collections ABCs to a separate file, _abcoll.py, in order to avoid needing to import _collections.so during the bootstrap (this will become apparent in the next submit of os.py). Add (plain and mutable) ABCs for Set, Mapping, Sequence. ................ r55912 | guido.van.rossum | 2007-06-11 13:09:31 -0700 (Mon, 11 Jun 2007) | 2 lines Rewrite the _Environ class to use the new collections ABCs. ................ r55913 | guido.van.rossum | 2007-06-11 13:59:45 -0700 (Mon, 11 Jun 2007) | 72 lines Merged revisions 55869-55912 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55869 | neal.norwitz | 2007-06-10 17:42:11 -0700 (Sun, 10 Jun 2007) | 1 line Add Atul Varma for patch # 1667860 ........ r55870 | neal.norwitz | 2007-06-10 18:22:03 -0700 (Sun, 10 Jun 2007) | 1 line Ignore valgrind problems on Ubuntu from ld ........ r55872 | neal.norwitz | 2007-06-10 18:48:46 -0700 (Sun, 10 Jun 2007) | 2 lines Ignore config.status.lineno which seems new (new autoconf?) ........ r55873 | neal.norwitz | 2007-06-10 19:14:39 -0700 (Sun, 10 Jun 2007) | 1 line Prevent these tests from running on Win64 since they don\'t apply there either ........ r55874 | neal.norwitz | 2007-06-10 19:16:10 -0700 (Sun, 10 Jun 2007) | 5 lines Fix a bug when there was a newline in the string expandtabs was called on. This also catches another condition that can overflow. Will backport. ........ r55879 | neal.norwitz | 2007-06-10 21:52:37 -0700 (Sun, 10 Jun 2007) | 1 line Prevent hang if the port cannot be opened. ........ r55881 | neal.norwitz | 2007-06-10 22:28:45 -0700 (Sun, 10 Jun 2007) | 4 lines Add all of the distuils modules that don't seem to have explicit tests. :-( Move an import in mworkscompiler so that this module can be imported on any platform. Hopefully this works on all platforms. ........ r55882 | neal.norwitz | 2007-06-10 22:35:10 -0700 (Sun, 10 Jun 2007) | 4 lines SF #1734732, lower case the module names per PEP 8. Will backport. ........ r55885 | neal.norwitz | 2007-06-10 23:16:48 -0700 (Sun, 10 Jun 2007) | 4 lines Not sure why this only fails sometimes on Unix machines. Better to disable it and only import msvccompiler on Windows since that's the only place it can work anyways. ........ r55887 | neal.norwitz | 2007-06-11 00:29:43 -0700 (Mon, 11 Jun 2007) | 4 lines Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute. Will backport ........ r55889 | neal.norwitz | 2007-06-11 00:36:24 -0700 (Mon, 11 Jun 2007) | 1 line Reflow long line ........ r55896 | thomas.heller | 2007-06-11 08:58:33 -0700 (Mon, 11 Jun 2007) | 3 lines Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k" or "K" codes. ........ r55901 | facundo.batista | 2007-06-11 09:27:08 -0700 (Mon, 11 Jun 2007) | 5 lines Added versionchanged flag to all the methods which received a new optional timeout parameter, and a versionadded flag to the socket.create_connection function. ........ ................ r55914 | guido.van.rossum | 2007-06-11 14:19:50 -0700 (Mon, 11 Jun 2007) | 3 lines New super() implementation, for PEP 3135 (though the PEP is not yet updated to this design, and small tweaks may still be made later). ................ r55923 | guido.van.rossum | 2007-06-11 21:15:24 -0700 (Mon, 11 Jun 2007) | 4 lines I'm guessing this module broke when Neal ripped out the types module -- it used 'list' both as a local variable and as the built-in list type. Renamed the local variable since that was easier. ................ r55924 | guido.van.rossum | 2007-06-11 21:20:05 -0700 (Mon, 11 Jun 2007) | 5 lines Change all occurrences of super(<thisclass>, <firstarg>) to super(). Seems to have worked, all the tests still pass. Exception: test_descr and test_descrtut, which have tons of these and are there to test the various usages. ................ r55939 | collin.winter | 2007-06-12 13:57:33 -0700 (Tue, 12 Jun 2007) | 1 line Patch #1735485: remove StandardError from the exception hierarchy. ................ r55954 | neal.norwitz | 2007-06-12 21:56:32 -0700 (Tue, 12 Jun 2007) | 51 lines Merged revisions 55913-55950 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) | 3 lines Apply patch #1734945 to support TurboLinux as distribution. ........ r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) | 3 lines Add patch #1726668: Windows Vista support. ........ r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line Checkout, but do not yet try to build, exernal sources. ........ r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6 lines Add bufferoverflowU.lib to the libraries needed by _ssl (is this the right thing to do?). Set the /XP64 /RETAIL build enviroment in the makefile when building ReleaseAMD64. ........ r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5 lines Revert this change, since it breaks the win32 build: Add bufferoverflowU.lib to the libraries needed by _ssl (is this the right thing to do?). ........ r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3 lines Specify the bufferoverflowU.lib to the makefile on the command line (for ReleaseAMD64 builds). ........ r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3 lines Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj. Build sqlite3.dll and bsddb. ........ r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2 lines Don't rebuild Berkeley DB if not needed (this was committed by accident). ........ r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3 lines Provide PY_LLONG_MAX on all systems having long long. Will backport to 2.5. ........ ................ r55959 | guido.van.rossum | 2007-06-13 09:22:41 -0700 (Wed, 13 Jun 2007) | 2 lines Fix a compilation warning. ................
714 lines
24 KiB
Python
714 lines
24 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
|
|
|
|
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
|
|
|
|
|
|
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 & 0o170000) == 0o040000
|
|
|
|
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)
|
|
# 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.
|
|
#
|