Changeset 751

Timestamp:

07/18/07 00:24:54 (1 year ago)

Author:

robin

Message:

run_magic_syspath

Files:

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

commando/trunk/commandolite.py

@@ -1 +1 @@
-import os
-import sys
+import re
-import errno
-import signal
@@ -10 +11 @@
-
-from os.path import abspath, normpath, join, expanduser, expandvars, dirname
-
-
-
+
+
+
+
+
-
-log = logging.getLogger(__name__)
@@ -151 +154 @@
-#-----------------------------------------------------------------------------
-# files, file names, paths
+
+# This is taken directly from setuptools pkg_resources
+pkg_resources_EGG_NAME = re.compile(
+    r"(?P<name>[^-]+)"
+    r"( -(?P<ver>[^-]+) (-py(?P<pyver>[^-]+) (-(?P<plat>.+))? )? )?",
+    re.VERBOSE | re.IGNORECASE
+).match
+
+pkg_resources_component_re = re.compile(r'(\d+ | [a-z]+ | \.| -)', re.VERBOSE)
+pkg_resources_ver_replace = {'pre':'c', 'preview':'c','-':'final-','rc':'c','dev':'@'}.get
+
+def pkg_resources_parse_version_parts(s):
+    for part in pkg_resources_component_re.split(s):
+        part = pkg_resources_ver_replace(part,part)
+        if not part or part=='.':
+            continue
+        if part[:1] in '0123456789':
+            yield part.zfill(8)    # pad for numeric comparison
+        else:
+            yield '*'+part
+
+    yield '*final'  # ensure that alpha/beta/candidate are before final
+
+
+def filter_best_eggs(source, remove_ifnoteggmatch=False):
+
+    eggs = {}
+    keep = []
+    prune_2ndpass = []
+
+    for s in source:
+        mo = pkg_resources_EGG_NAME(basename(s))
+        if not mo:
+            if not remove_ifnoteggmatch:
+                keep.append(s)
+            continue
+
+        pkgname, ver, pyver = (
+                mo.group('name'), mo.group('ver'), mo.group('pyver')
+                )
+        if not (pkgname and ver and pyver):
+            if pkgname and not remove_ifnoteggmatch:
+                keep.append(s)
+            continue
+
+        if not pyver.startswith(sys.version[:3]):
+            continue
+
+        ver = tuple(pkg_resources_parse_version_parts(ver))
+
+        if pkgname not in eggs:
+            eggs[pkgname] = (pkgname, ver, s)
+            keep.append(s)
+        elif ver >= eggs[pkgname][1]:
+            prune_2ndpass.append(s)
+        elif ver < eggs[pkgname][1]:
+            prune_2ndpass.append(eggs[pkgname][2])
+            keep.append(s)
+
+    prune_2ndpass = frozenset(prune_2ndpass)
+
+    return [s for s in keep if s not in prune_2ndpass]
+
+
+
-def abs_normpath(path, *parts):
-    if not parts:
@@ -212 +280 @@
-        raise ValueError, "path '%s' cannot end with '/'" % pathname
-
-string.split(pathname, 
+pathname.split(
-    while '.' in paths:
-        paths.remove('.')
@@ -244 +312 @@
-    return out
-
-
+
+
+
+
-    if (isdir(path) and '.' not in name and (
-        isfile(join(path, '__init__.py')) or
@@ -253 +324 @@
-    return False
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    tops={}
-    out = []
-    stack=[convert_path(where)]
-    while stack:
@@ -267 +365 @@
-            if result:
-                tops.setdefault(where, []).append(result)
-isdir
+allow_descent
-                stack.append(fn)
-
-    return sorted(tops.items())
-
+
+def find_package_paths(*rootpaths, **kw):
+
+    pthset = set(kw.pop('pth', []))
+    pth = []
+
+    evpp = lambda p,name='': evaluate_packagepath(p)
+
+    for rp in rootpaths:
+        ep = evpp(rp)
+        if ep and ep not in pthset:
+            pthset.add(ep)
+            pth.append(ep)
+            continue
+        if not isdir(rp):
+            continue
+        for top in find_top_packages(rp,
+                evaluate_packagelocation=evpp
+                ):
+            for p in top[1]:
+                if p not in pthset:
+                    pth.append(p)
+                    pthset.add(p)
+
+    return filter_best_eggs(pth)
+
+
+
+#-----------------------------------------------------------------------------
+# python code execution
+
+
+def run_magic_syspath(argv=None,
+        import_modules=False, run_last_module=True):
+    """Run a module using a magicaly extended sys.path.
+
+    Discovers additional package paths by searching under directories listed as
+    non option arguments. Discovery is egg aware: it takes care to include only
+    the *best* version of each egg and only those eggs that match the python
+    interpreters version.
+
+    If the last argument names a legitemate python module then sys.path is
+    extended with the discovered paths, sys.argv is adjusted to reflect the
+    module name and the remaining arguments. Then runpy.run_module is used to
+    execute the module in this magicaly discovered path.
+
+    If any non option argument, other than the last, identifies a python module
+    then sys.path is updated and an attempt to import the module is made. This
+    feature allows import of packages whose import time behaviour would be
+    adversly affected by any paths added on behalf of subsequent modules. Note
+    that you can disable this by setting `import_modules=False` and
+    `run_last_module=True`. This will defer all import behaviour to the module
+    you chose to *run*.
+
+    If the last argument is not a python package then two lists are returned.
+    The first list contains the discovered path and the second list contains
+    any modules that were imported as it was discovered. The second list will
+    allways be empty if `import_modules` is False.
+
+    TODO: examples
+
+    """
+
+    argv = argv or sys.argv[:]
+    lenargv = len(argv)
+    if lenargv < 2:
+        sys.exit(-1)
+
+    ia=1
+    for i in range(lenargv - 1):
+        ia = i + 1
+        a = argv[ia]
+        if a == '--':
+            del argv[ia]
+            break
+        elif a[:2] == '--' or a[:1] == '-':
+            break
+    else:
+        ia=lenargv
+
+    minfo = None
+
+    searchpaths = []
+    pthset = set([])
+    pathsadded = []
+    pthextend = []
+    sys_path_insertpos = 0
+
+    imported = [] # hold on to the references.
+
+    for i, a in enumerate(argv[1:ia]):
+
+        minfo = path_moduleinfo(a)
+        if minfo:
+            # if its a legitemate python module file, import it with the
+            # path we have discovered so far.
+            if minfo[1] in sys.modules:
+                continue
+
+            if minfo[0] not in pthset:
+                pthextend.append(minfo[0])
+                pthset.add(minfo[0])
+
+            # Don't import modules or update sys.path if import_modules is
+            # False
+            if not import_modules:
+                continue
+
+            # If the last argument is a module, then dont import it. We will
+            # run it instead.
+            if i+2 == ia:
+                continue
+
+            newpaths = find_package_paths(pth=pthset,
+                *searchpaths
+                )
+            pthextend.extend(newpaths)
+
+            sys.path[sys_path_insertpos:sys_path_insertpos
+                    ] = pthextend[:]
+            sys_path_insertpos += len(pthextend)
+
+            pathsadded.extend(newpaths)
+            pthextend[:] = []
+            searchpaths[:] = []
+
+            imported.append(__import__(minfo[1]))
+
+            minfo = None
+            continue
+
+        else:
+            searchpaths.append(a)
+
+
+    newpaths = find_package_paths(pth=pthset,
+        *searchpaths
+        )
+
+    pthextend.extend(newpaths)
+
+    if import_modules or run_last_module:
+        sys.path[sys_path_insertpos:sys_path_insertpos
+                ] = pthextend[:]
+
+    pathsadded.extend(newpaths)
+
+    if not run_last_module:
+        return pathsadded, imported
+
+    if minfo:
+        sys.argv[:] = []
+        sys.argv.append(minfo[1])
+        sys.argv.extend(argv[ia:])
+        run_module(sys.argv[0], run_name='__main__', alter_sys=True)
+
+    return pathsadded, imported
-
-#-----------------------------------------------------------------------------

commando/trunk/tests/test_pathdiscovery.py

@@ -1 @@
-
-
+os, 
+expandvars, 
-try:
-    import commandolite
-except ImportError:
-
+
+
+
+
-    if abs_topdir not in sys.path:
-        sys.path.insert(0, abs_topdir)
-    import commandolite
-
-from os.path import abspath, normpath, expanduser
-from os.path import split, basename
-from inspect import getmoduleinfo, getmodulename
-import imp
-
-def test_path_moduleinfo():
@@ -24 +23 @@
-    #print commandolite.path_moduleinfo(sys.argv[1])
-    #print commandolite.find_packages(sys.argv[1])
-
+
+
-
-