Changeset 792

Timestamp:

08/19/07 15:06:23 (1 year ago)

Author:

robin

Message:

exclusion directory prefixes and arbitrary (post discovery) prunes; and use logging for notification

Files:

• pyrun/trunk/ChangeLog (modified) (1 diff)
• pyrun/trunk/pyrun.py (modified) (17 diffs)

pyrun/trunk/ChangeLog

@@ -3 +3 @@
-
-0.1.1:
+  * Added support for directory exclusions and path prunes.
+     exclusion prevents discovery descending into a directory if that
+      directory startswith an element in the exclusion set (see new option -x).
+     prune operates on the result of the discovery. Any path which
+      contains one of the strings specified by a prune is removed from the
+      discovered path.
+     exclusion hides directories from the discovery process, prune removes
+     results after the fact.
+     .
+     exclusions are enabled by -x
+     prunes are enabled by -X
+     empty strings are *always* removed from -x and -X.
+     .
+     Note that no mechanism is provided for adding a path back in *under*
+     and excluded directory.
+  * Decided to use logging instead of print for notification, I had avoided
+    this previously because I did not want to polute the logging configuration
+    of the target app. I consider this change provisional, if it causes to
+    much trouble I will revert to print
-  * Added support for including .pth files in the discovery phase. This
-    makes it possible to insert paths to directories which do not contain

pyrun/trunk/pyrun.py

@@ -7 +7 @@
-from os.path import join, dirname, basename, isfile, isdir, exists
-from os.path import splitext
+
+import logging
+log = logging.getLogger(__name__)
-
-have_runpy=False
@@ -269 +272 @@
-
-    pthset = set(kw.pop('pth', []))
+    exclude = kw.pop('exclude', [])
-    pth = []
-
-
+
+
+
+
+
+
+
+
+
+
-
-    for rp in rootpaths:
-        ep = evpp(rp)
+
+        # Don't apply exclude to explicitly listed python files.
-        if ep and ep not in pthset:
-            pthset.add(ep)
@@ -282 +297 @@
-            continue
-        for top in find_top_packages(rp,
-
+
+
-                ):
-            for p in top[1]:
@@ -303 +319 @@
-
-
-
+exclude, 
-
-    """Discover a python path.
@@ -342 +358 @@
-    """
-
+    if exclude is None:
+        exclude = frozenset([])
-    doesnotexist = []
-    minfos = []
@@ -369 +387 @@
-        elif isfile(a) and splitext(a)[1] == '.pth':
-            if findpaths:
-
+
+
-                    *findpaths
-                    )
@@ -400 +419 @@
-            findpaths.append(a)
-
-
+
+
-        *findpaths
-        )
@@ -408 +428 @@
-
-
-
+
+
-    """Discover package paths and run the last module listed in argv.
-
@@ -444 +465 @@
-    argv = argv or sys.argv[:]
-
-
+exclude, 
-
-    # We are running the module, eat the artificial `--` delimiter
@@ -570 +591 @@
-the sys.argv the module sees."""
-
+def int_log_level(level):
+    """Coerce a log level to an integer.
+
+    In a manner cognizant of run time configured level names."""
+
+    try:
+        return int(level)
+    except ValueError:
+        try:
+            return getattr(logging, level)
+        except AttributeError:
+            level = logging.getLevelName(level)
+            level = logging.getLevelName(level)
+            assert isinstance(level, int)
+            return level
+
+
-def runex(argv=None):
-    """Provides Extened `pyrun` features on the command line."""
@@ -587 +625 @@
-    argv.insert(0, None)
-
+    logging.basicConfig(
+            level=int_log_level(getattr(opts, 'log_level', 'WARNING')),
+            format='%(message)s'
+            )
+
+    exclude = []
+    if opts.x:
+        for e in opts.x.split(os.pathsep):
+            if not e:
+                log.warning(
+                'Warning: empty path found in (and removed from) your '
+                'exclusion path (-x)'
+                )
+                continue
+            exclude.append(e)
+
+    prune = []
+    for p in opts.X:
+        if not p:
+            log.warning(
+            'Warning: empty path found in (and removed from) your '
+            'prune list (-X)'
+            )
+            continue
+        prune.append(p)
+
-    try:
-        source = False
-        sourcefile = None
-        if opts.c and opts.C and not opts.q:
-print 
+log.warning(
-            Warning: -c and -C can not be used together. Ignoring "-C %s"
-
+)
-            )
-
@@ -605 +669 @@
-
-        pthextend, minfos, ia, doesnotexist = discover_path(
-
+exclude, 
-
-        if not opts.q and doesnotexist:
-print 
+log.warning(
-            Warning: your discovery path arguments referenced the following
-            files or directories which do not exist on the file system:
-            ''')
-
+
+
-
-
@@ -668 +733 @@
-
-        if opts.c and opts.C and not opts.q:
-print 
+log.warning(
-            'Warning: -c and -C can not be used together. Ignoring "-C %s"'
-            ) % opts.C
+            )
-
-        if opts.C:
@@ -681 +747 @@
-        modname = not source and (opts.m or (minfos and minfos[0][1]) or '')
-
+        # prune and paths which contain *non empty* strings spefcified by -X
+        for X in prune:
+            if not X:
+                log.warning(
+                'Warning: An empty string was specified using -X, '
+                'as this would prune *all* paths it will be ignored.'
+                )
+                continue
+            pthextend[:] = [p for p in pthextend if X not in p]
+
-        # 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
@@ -696 +772 @@
-        def run():
-            if opts.n:
-print 'execution of module disabled by user options'
+log.critical('execution of module disabled by user options')
-                return 0
-            if not target_argv:
-print 'argv is empty'
+log.critical('argv is empty')
-                return 0
-            sys.argv[:] = target_argv[:]
@@ -808 +884 @@
-
-OPTIONS_runex=[
+('--log-level', dict(default=False)),
-('-q', dict(default=False, action='store_true', metavar='QUIET', help=
-"""Suppress all warnings about missing paths etc. Useful when you are
@@ -849 +926 @@
-('-c', dict(default=False, metavar='STATEMENT', help=
-"""Update sys.argv and sys.path then execute the statement in a new, clean,
-
+
+
+
+
+
+
+
+
+
-
-    ]