Changeset 750

Timestamp:

07/16/07 21:15:52 (1 year ago)

Author:

robin

Message:

--

Files:

• commando/trunk/commandolite.py (modified) (2 diffs)

commando/trunk/commandolite.py

@@ -470 +470 @@
-
-
-def _path_adder(add_path, added, p, e=None, loginfo=log.info):
-    if e is None:
-        save_path = (p, sys.path[:])
-        loginfo and loginfo('Adding path: %s' % p)
-        add_path(p)
-        added.add(p)
-        return save_path
-    else:
-        p, save_path = p
-        loginfo and loginfo('Undoing add path: %s' % p)
-        added.remove(p)
-        sys.path[:] = save_path[:]
-
-
-def pth_addeggs(basedir, add_pathitem, allow_links=True):
-    pth = glob(abs_normpath(basedir, '-py'+sys.version[:3]+'*.egg'))
@@ -491 +477 @@
-        add_pathitem(p)
-    return pth
-
-
-def pth_import(modulename, fallback_paths, promiscuous_eggpaths=True,
-        code_getter=get_module_code, path_adder=None,
-        projectversion=False, pth_filename='pyrun.pth', loginfo=log.info):
-    """Attempt to obtain the module code for modulename.
-
-    The following heuristic is used to attempt the import from a variety of
-    fallback locations **if the initial get fails**:
-
-    If any step is successful break out immediately and compute the
-    return path.
-
-    1. Make the first attempt without modifying the path.
-
-    2. If pth_filename file exists in fallback_paths[0] then extend the
-    path, via ``site.addsitedir`` with the directories listed in that file.
-
-    3. Attempt again.
-
-    4. If the import failed AND projectversion is not False,
-        contstruct a glob
-        pattern like this::
-
-            abs_normpath(fallback_path_item,
-                projectversion+'-py'+sys.version[:3]+'*.egg')
-
-        and sort the results **in lexically ascending order**. If the result is non
-        empty add it to the path and try again
-
-    repeat 2., 3., 4. for every remaining path in fallback_paths
-
-    """
-    if not path_adder:
-        import site
-        # don't want to muck around with site._init_pathinfo and known_paths
-        added = set([])
-        def path_adder(p, e=None):
-            return _path_adder(site.addsitedir, added, p, e=e, loginfo=loginfo)
-
-    try:
-        modcode = code_getter(modulename)
-        return modcode
-    except ImportError:
-        pass
-    for p in fallback_paths:
-        if is_zipfile(p) or isdir(p):
-            adder_key = path_adder(p)
-        try:
-            modcode = code_getter(modulename)
-            return modcode
-        except ImportError, e:
-            path_adder(adder_key, e)
-            if not projectversion and isdir(p):
-                continue
-        # glob patterns only apply when a projectversion is supplied and
-        # the fallback path is a directory.
-        pattern = abs_normpath(p, projectversion+'-py'+sys.version[:3]+'*.egg')
-        loginfo and loginfo('egg glob pattern: %s', pattern)
-        projecteggs = glob(pattern)
-        if not projecteggs or eggpaths:
-            continue
-        projecteggs.sort()
-        adder_key = path_adder(projecteggs[-1])
-        try:
-            modcode = code_getter(modulename)
-            return modcode
-        except ImportError, e:
-            path_adder(adder_key, e)
-            continue
-    raise ImportError('No module named '+modulename)
-
-
-def module_enter(modulename, argv=None, ns=None, program_name=None):
-
-    if type(modulename) == types.ModuleType:
-        mod=modulename
-        modulename=mod.__name__
-    else:
-        ns=ns or globals()
-        mod = __import__(
-                modulename, ns, locals(),
-                modulename.split('.')[-1])
-    if program_name is None:
-        program_name = modulename
-    log=logging.getLogger(modulename)
-
-