Changeset 779

Timestamp:

08/01/07 09:03:50 (1 year ago)

Author:

robin

Message:

* feature: for each explicitly listed module file, discover the top most

package directory - the parent of the top most package directory is then
used for the path entry. -m must use fully qualified module names now.

Files:

• pyrun/trunk/ChangeLog (modified) (1 diff)
• pyrun/trunk/pkg-info.rst (modified) (1 diff)
• pyrun/trunk/pyrun.py (modified) (6 diffs)

pyrun/trunk/ChangeLog

@@ -2 +2 @@
-~~~~~~~~~
-
-
+
+
+
+
+
+
+
-
-  * path discovery and  python module execution

pyrun/trunk/pkg-info.rst

@@ -1 +1 @@
-:License: MIT
-:Name: pyrun
-b
+c
-:Author: Robin Bryce
-:Author-email: robinbryce@gmail.com

pyrun/trunk/pyrun.py

@@ -73 +73 @@
-    return (dirname(path), modname, ext, mode, mtype)
-
+
+def path_pkg_moduleinfo(path, allowmtypes=(imp.PY_SOURCE, imp.PY_COMPILED)):
+    """Get extended module info for `path`
+
+    `path` must be the location of a real file on disk.
+
+    If path identifies a legitemate python file (as determined by
+    inspect.getmoduleinfo) then return a 4 element tuple:
+
+    (pkg_path, modname, ext, mode, mtype)
+
+    ext, mode and mtype are obtained using `inspect.getmoduleinfo`
+
+    `modname` is the fully qualified module name.
+    `path` is the directory containing the top most package.
+
+    `modname` and `pkg_path` are found by testing succesive directories above
+    `path`. The upward walk terminates when it encounters a directory whose
+    basename is not a legal python module name OR which does not contain a
+    suitable __init__.py (The search allows for __init__.py, __init__.pyc,
+    and __init__.pyo).
+
+    """
+
+    if not isfile(path):
+        return None
+
+    v = inspect.getmoduleinfo(path)
+    if not v:
+        return
+    modname, ext, mode, mtype = v
+    if mtype not in allowmtypes:
+        return None
+
+    p = dirname(path)
+    packagedirs = []
+    packages = []
+    m = basename(p)
+    while (p and '.' not in m
+            and (isfile(join(p, '__init__.py'))
+                or isfile(join(p, '__init__.pyc')))):
+        packagedirs.append(p)
+        packages.append(m)
+        p = dirname(p)
+        m = basename(p)
+
+    packagedirs.reverse()
+    packages.reverse()
+    packages.append(modname)
+
+    return (p, '.'.join(packages), ext, mode, mtype)
+
+
+def run_pkg_minfo():
+    print path_pkg_moduleinfo(sys.argv[1])
+    return 0
+
-# from distutils.util, because fools at debian think its a good idea to remove
-# distutils from the standard distribution.
@@ -306 +363 @@
-    for ia, a in enumerate_argv_args(args, offset):
-
-
+
+
-        if minfo:
-            minfos.append(minfo)
@@ -461 +519 @@
-        modname = opts.m or (minfos and minfos[0][1]) or ''
-
+        # Allways update the sys path. pthextend is the record of what we have
+        # done. The record only matters for interative mode in cases where you
+        # want to adjust the find results.
+        sys.path[0:0] = pthextend[:]
+
+        # But defer sys.argv changes until the last instant. This lets
+        # the interpreted mode be used to conveniently fiddle with argv.
+
-        target_argv = []
-        if modname:
-            target_argv.append(modname)
-            target_argv.extend(argv[ia:])
+
-        def run_module():
-            if opts.n:
@@ -474 +541 @@
-            import runpy
-            sys.argv[:] = target_argv[:]
-            sys.path[0:0] = pthextend[:]
-            return runpy.run_module(
-                    modname, run_name='__main__', alter_sys=True
@@ -494 +560 @@
-                banner += '\n\n'
-            banner += """\
-
-
-
-
-
+
+
+
+
+
+
+
-            import code
-            code.interact(banner=banner, local=locals())
@@ -616 +684 @@
-
-if __name__=='__main__':
+    #sys.exit(run_top_minfo())
-    sys.exit(runex())
-