mirror of
https://github.com/python/cpython.git
synced 2025-10-31 21:51:50 +00:00
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.
................
713 lines
24 KiB
Python
713 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 & 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)
|
|
# 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.
|
|
#
|