traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

no changes other than indentation level (now 4) and comment reflow. 

use "cvs diff -b" to verify.
This commit is contained in:
Greg Stein 2000-07-18 09:09:48 +00:00
parent 9542f48fd5
commit dd6eefb348
3 changed files with 1133 additions and 1124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

302
Demo/imputil/importers.py
View File

@ -34,70 +34,70 @@ _suffix = '.py' + _suffix_char
_c_suffixes = filter(lambda x: x[2] == imp.C_EXTENSION, imp.get_suffixes()) _c_suffixes = filter(lambda x: x[2] == imp.C_EXTENSION, imp.get_suffixes())
def _timestamp(pathname): def _timestamp(pathname):
"Return the file modification time as a Long." "Return the file modification time as a Long."
try: try:
s = os.stat(pathname) s = os.stat(pathname)
except OSError: except OSError:
return None return None
return long(s[8]) return long(s[8])
def _fs_import(dir, modname, fqname): def _fs_import(dir, modname, fqname):
"Fetch a module from the filesystem." "Fetch a module from the filesystem."
pathname = os.path.join(dir, modname) pathname = os.path.join(dir, modname)
if os.path.isdir(pathname): if os.path.isdir(pathname):
values = { '__pkgdir__' : pathname, '__path__' : [ pathname ] } values = { '__pkgdir__' : pathname, '__path__' : [ pathname ] }
ispkg = 1 ispkg = 1
pathname = os.path.join(pathname, '__init__') pathname = os.path.join(pathname, '__init__')
else: else:
values = { } values = { }
ispkg = 0 ispkg = 0
# look for dynload modules # look for dynload modules
for desc in _c_suffixes: for desc in _c_suffixes:
file = pathname + desc[0] file = pathname + desc[0]
try: try:
fp = open(file, desc[1]) fp = open(file, desc[1])
except IOError: except IOError:
pass pass
else: else:
module = imp.load_module(fqname, fp, file, desc) module = imp.load_module(fqname, fp, file, desc)
values['__file__'] = file values['__file__'] = file
return 0, module, values return 0, module, values
t_py = _timestamp(pathname + '.py') t_py = _timestamp(pathname + '.py')
t_pyc = _timestamp(pathname + _suffix) t_pyc = _timestamp(pathname + _suffix)
if t_py is None and t_pyc is None: if t_py is None and t_pyc is None:
return None return None
code = None code = None
if t_py is None or (t_pyc is not None and t_pyc >= t_py): if t_py is None or (t_pyc is not None and t_pyc >= t_py):
file = pathname + _suffix file = pathname + _suffix
f = open(file, 'rb') f = open(file, 'rb')
if f.read(4) == imp.get_magic(): if f.read(4) == imp.get_magic():
t = struct.unpack('<I', f.read(4))[0] t = struct.unpack('<I', f.read(4))[0]
if t == t_py: if t == t_py:
code = marshal.load(f) code = marshal.load(f)
f.close() f.close()
if code is None: if code is None:
file = pathname + '.py' file = pathname + '.py'
code = _compile(file, t_py) code = _compile(file, t_py)
values['__file__'] = file values['__file__'] = file
return ispkg, code, values return ispkg, code, values
###################################################################### ######################################################################
# #
# Simple function-based importer # Simple function-based importer
# #
class FuncImporter(imputil.Importer): class FuncImporter(imputil.Importer):
"Importer subclass to use a supplied function rather than method overrides." "Importer subclass to delegate to a function rather than method overrides."
def __init__(self, func): def __init__(self, func):
self.func = func self.func = func
def get_code(self, parent, modname, fqname): def get_code(self, parent, modname, fqname):
return self.func(parent, modname, fqname) return self.func(parent, modname, fqname)
def install_with(func): def install_with(func):
FuncImporter(func).install() FuncImporter(func).install()
###################################################################### ######################################################################
@ -105,79 +105,79 @@ def install_with(func):
# Base class for archive-based importing # Base class for archive-based importing
# #
class PackageArchiveImporter(imputil.Importer): class PackageArchiveImporter(imputil.Importer):
"""Importer subclass to import from (file) archives. """Importer subclass to import from (file) archives.
This Importer handles imports of the style <archive>.<subfile>, where This Importer handles imports of the style <archive>.<subfile>, where
<archive> can be located using a subclass-specific mechanism and the <archive> can be located using a subclass-specific mechanism and the
<subfile> is found in the archive using a subclass-specific mechanism. <subfile> is found in the archive using a subclass-specific mechanism.
This class defines two hooks for subclasses: one to locate an archive This class defines two hooks for subclasses: one to locate an archive
(and possibly return some context for future subfile lookups), and one (and possibly return some context for future subfile lookups), and one
to locate subfiles. to locate subfiles.
"""
def get_code(self, parent, modname, fqname):
if parent:
# the Importer._finish_import logic ensures that we handle imports
# under the top level module (package / archive).
assert parent.__importer__ == self
# if a parent "package" is provided, then we are importing a sub-file
# from the archive.
result = self.get_subfile(parent.__archive__, modname)
if result is None:
return None
if isinstance(result, _TupleType):
assert len(result) == 2
return (0,) + result
return 0, result, {}
# no parent was provided, so the archive should exist somewhere on the
# default "path".
archive = self.get_archive(modname)
if archive is None:
return None
return 1, "", {'__archive__':archive}
def get_archive(self, modname):
"""Get an archive of modules.
This method should locate an archive and return a value which can be
used by get_subfile to load modules from it. The value may be a simple
pathname, an open file, or a complex object that caches information
for future imports.
Return None if the archive was not found.
""" """
raise RuntimeError, "get_archive not implemented"
def get_subfile(self, archive, modname): def get_code(self, parent, modname, fqname):
"""Get code from a subfile in the specified archive. if parent:
# the Importer._finish_import logic ensures that we handle imports
# under the top level module (package / archive).
assert parent.__importer__ == self
Given the specified archive (as returned by get_archive()), locate # if a parent "package" is provided, then we are importing a
and return a code object for the specified module name. # sub-file from the archive.
result = self.get_subfile(parent.__archive__, modname)
if result is None:
return None
if isinstance(result, _TupleType):
assert len(result) == 2
return (0,) + result
return 0, result, {}
A 2-tuple may be returned, consisting of a code object and a dict # no parent was provided, so the archive should exist somewhere on the
of name/values to place into the target module. # default "path".
archive = self.get_archive(modname)
if archive is None:
return None
return 1, "", {'__archive__':archive}
Return None if the subfile was not found. def get_archive(self, modname):
""" """Get an archive of modules.
raise RuntimeError, "get_subfile not implemented"
This method should locate an archive and return a value which can be
used by get_subfile to load modules from it. The value may be a simple
pathname, an open file, or a complex object that caches information
for future imports.
Return None if the archive was not found.
"""
raise RuntimeError, "get_archive not implemented"
def get_subfile(self, archive, modname):
"""Get code from a subfile in the specified archive.
Given the specified archive (as returned by get_archive()), locate
and return a code object for the specified module name.
A 2-tuple may be returned, consisting of a code object and a dict
of name/values to place into the target module.
Return None if the subfile was not found.
"""
raise RuntimeError, "get_subfile not implemented"
class PackageArchive(PackageArchiveImporter): class PackageArchive(PackageArchiveImporter):
"PackageArchiveImporter subclass that refers to a specific archive." "PackageArchiveImporter subclass that refers to a specific archive."
def __init__(self, modname, archive_pathname): def __init__(self, modname, archive_pathname):
self.__modname = modname self.__modname = modname
self.__path = archive_pathname self.__path = archive_pathname
def get_archive(self, modname): def get_archive(self, modname):
if modname == self.__modname: if modname == self.__modname:
return self.__path return self.__path
return None return None
# get_subfile is passed the full pathname of the archive # get_subfile is passed the full pathname of the archive
###################################################################### ######################################################################
@ -185,26 +185,26 @@ class PackageArchive(PackageArchiveImporter):
# Emulate the standard directory-based import mechanism # Emulate the standard directory-based import mechanism
# #
class DirectoryImporter(imputil.Importer): class DirectoryImporter(imputil.Importer):
"Importer subclass to emulate the standard importer." "Importer subclass to emulate the standard importer."
def __init__(self, dir): def __init__(self, dir):
self.dir = dir self.dir = dir
def get_code(self, parent, modname, fqname): def get_code(self, parent, modname, fqname):
if parent: if parent:
dir = parent.__pkgdir__ dir = parent.__pkgdir__
else: else:
dir = self.dir dir = self.dir
# Return the module (and other info) if found in the specified # Return the module (and other info) if found in the specified
# directory. Otherwise, return None. # directory. Otherwise, return None.
return _fs_import(dir, modname, fqname) return _fs_import(dir, modname, fqname)
def __repr__(self): def __repr__(self):
return '<%s.%s for "%s" at 0x%x>' % (self.__class__.__module__, return '<%s.%s for "%s" at 0x%x>' % (self.__class__.__module__,
self.__class__.__name__, self.__class__.__name__,
self.dir, self.dir,
id(self)) id(self))
###################################################################### ######################################################################
@ -212,37 +212,37 @@ class DirectoryImporter(imputil.Importer):
# Emulate the standard path-style import mechanism # Emulate the standard path-style import mechanism
# #
class PathImporter(imputil.Importer): class PathImporter(imputil.Importer):
def __init__(self, path=sys.path): def __init__(self, path=sys.path):
self.path = path self.path = path
def get_code(self, parent, modname, fqname): def get_code(self, parent, modname, fqname):
if parent: if parent:
# we are looking for a module inside of a specific package # we are looking for a module inside of a specific package
return _fs_import(parent.__pkgdir__, modname, fqname) return _fs_import(parent.__pkgdir__, modname, fqname)
# scan sys.path, looking for the requested module # scan sys.path, looking for the requested module
for dir in self.path: for dir in self.path:
if isinstance(dir, _StringType): if isinstance(dir, _StringType):
result = _fs_import(dir, modname, fqname) result = _fs_import(dir, modname, fqname)
if result: if result:
return result return result
# not found # not found
return None return None
###################################################################### ######################################################################
def _test_dir(): def _test_dir():
"Debug/test function to create DirectoryImporters from sys.path." "Debug/test function to create DirectoryImporters from sys.path."
imputil.ImportManager().install() imputil.ImportManager().install()
path = sys.path[:] path = sys.path[:]
path.reverse() path.reverse()
for d in path: for d in path:
sys.path.insert(0, DirectoryImporter(d)) sys.path.insert(0, DirectoryImporter(d))
sys.path.insert(0, imputil.BuiltinImporter()) sys.path.insert(0, imputil.BuiltinImporter())
def _test_revamp(): def _test_revamp():
"Debug/test function for the revamped import system." "Debug/test function for the revamped import system."
imputil.ImportManager().install() imputil.ImportManager().install()
sys.path.insert(0, PathImporter()) sys.path.insert(0, PathImporter())
sys.path.insert(0, imputil.BuiltinImporter()) sys.path.insert(0, imputil.BuiltinImporter())

1038
Lib/httplib.py
View File

File diff suppressed because it is too large Load Diff

917
Lib/imputil.py
View File

File diff suppressed because it is too large Load Diff