Changeset 753

Timestamp:

07/18/07 20:33:16 (1 year ago)

Author:

robin

Message:

--

Files:

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

commando/trunk/commandolite.py

@@ -257 +257 @@
-    if mtype not in allowmtypes:
-        return None
-user(path
+vars(expanduser(path)
-    return (abs_path, modname, ext, mode, mtype)
-
@@ -396 +396 @@
-    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
-
-#-----------------------------------------------------------------------------
@@ -713 +582 @@
-# main entry point wrappers and helpers
-
+def enumerate_argv_args(argv, startpos=0):
+
+    for i in range(len(argv) - startpos):
+        ia = i + startpos
+        a = argv[ia]
+        if a == '--':
+            yield ia + 1, None
+            return
+        elif a[:2] == '--' or a[:1] == '-':
+            return
+        else:
+            yield ia, a
+
+
-def get_module_code(mod_name):
-    """like runpy.run_module but dont run."""
@@ -787 +670 @@
-
-
+def run_magic_syspath(argv=None, 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 it will be
+    executed using the `runpy.run_module` helper from the standard lib. This
+    feature can be disabled by passing a false value for `run_last_module`.
+
+    If any `interior` argument identifies a python module then its containing
+    directory is added to the path extension.
+
+    The extension path discovered by this api consists of unique paths in order
+    of discovery. Where egg directories or archive files are encountered care
+    is taken to ensure that eggs which are incompatible with the current
+    `sys.executable` are *excluded* and only the *best* available version for
+    each project is *included*. The measure of "best available" is the same as
+    used by pkg_resources.py from the setuptools project.
+
+
+    :Returns:
+        The discovered extension path. But note that if `run_last_module` is
+        true it resonably likely that this function will *not return*.
+
+    TODO: examples
+
+    """
+
+    argv = argv or sys.argv[:]
+
+    pthextend = []
+    searchpaths = []
+    pthset = set([])
+
+    minfo = None
+    for ia, a in enumerate_argv_args(argv, 1):
+        if a is None:
+            continue
+        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
+
+            a = minfo[0]
+            if a not in pthset:
+                pthextend.append(a)
+                pthset.add(a)
+
+        else:
+            searchpaths.append(a)
+
+    newpaths = find_package_paths(pth=pthset,
+        *searchpaths
+        )
+    pthextend.extend(newpaths)
+
+    if run_last_module and minfo:
+        sys.path[0:0] = pthextend[:]
+        sys.argv[:] = []
+        sys.argv.append(minfo[1])
+        sys.argv.extend(argv[ia:])
+        return run_module(sys.argv[0], run_name='__main__', alter_sys=True)
+
+    else:
+        return pthextend
+
+
+if __name__=='__main__':
+    try:
+        rval = run_magic_syspath()
+        if rval and isinstance(rval, list):
+            print os.pathsep.join(rval)
+    except SystemExit:
+        raise
+    except:
+        msg = exc_string()
+        print msg
+        sys.exit(-1)
+#EOF
+