Changeset 798

Timestamp:

09/16/07 16:48:24 (1 year ago)

Author:

robin

Message:

eggtool updated for use with pyrun

Files:

• pyrun/trunk/eggtool.py (added)
• pyrun/trunk/pyrun.py (modified) (5 diffs)

pyrun/trunk/pyrun.py

@@ -317 +317 @@
-        else:
-            yield ia, a
+
+
+def get_inferior_argv(
+        opts, default_opts, flag_opts, argv, ia, short_opts=None):
+    if short_opts is None:
+        short_opts = {}
+
+    assert ia <= len(argv), (
+            'ia=%s, argv="%s"'
+            ) % (ia, str(argv)
+                    )
+    if ia == len(argv):
+        return []
+
+    # Unconsumed arguments exist and start at index `ia` in `argv` As a
+    # convenience we allow any *one* of the caller options to be used as to
+    # delimit the end of its non option arguments. This means that we need to
+    # examine the first remaining option and determine whether its intended for
+    # the caller and if so whether it means we have more to do. But, and this
+    # is *IMPORTANT*, if any option value was taken before calling this routine
+    # it is assumed that the instance remaining in argv is for the inferior
+    # target and and hence is left in place. For example ``pyrun -m bar ~/foo
+    # -m 12`` means search under `~/foo` for package paths, then run module
+    # `bar` with an argv of: ``['bar', '-m', '12']``
+    #
+
+    if argv[ia] == '--':
+        del argv[ia]
+    else:
+
+        # Short or long ?
+        if argv[ia].startswith('--'):
+            nextopt = argv[ia][2:]
+        else:
+            nextopt = argv[ia][1:]
+            if nextopt not in default_opts:
+                nextopt = short_opts[nextopt]
+
+        # If its one of the callers options and the callers option values does
+        # not have the corresponding value set then take nextopt; This alows
+        # for a degree of overlap in options between the caller and the
+        # inferior target - only the first instance of an option will be taken
+        # by the caller.
+
+        if nextopt in default_opts and (
+                getattr(opts, nextopt) == default_opts[nextopt]):
+
+            # It's possibly a caller option.
+
+            # Distinguish between those arguments that require values and those
+            # that don't
+            if nextopt in flag_opts:
+
+                setattr(opts, nextopt, not default_opts[nextopt])
+                del argv[ia]
+
+            else:
+                # if its not a flag and it is a caller option then it takes a
+                # single argument.
+                if len(argv) >= ia+1:
+                    setattr(opts, nextopt, argv[ia+1])
+                    del argv[ia:ia+2]
+                else:
+                    log.warning(
+                            'The `-%s` option requires an argument', nextopt)
+
+
+        # else: its definitely *not* a caller option, leave it for the inferior
+    return argv[ia:]
-
-
@@ -583 +652 @@
-    return '\n'.join(map(''.__class__.strip, s.split('\n')))
-
+
+
-interactive_BANNER_BOILERPLATE = """\
-handy locals() are:
@@ -682 +753 @@
-        # If there are no unconsumed arguments: We have already determined
-        # the user does not want to run a module. So we are done.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-        if opts.c and opts.C and not opts.q:
@@ -768 +792 @@
-        if modname or source:
-            target_argv.append(modname or source)
-argv[ia:]
+inferior_argv
-
-        def run():
@@ -943 +967 @@
-    ]
-
-
+
+
-    if kw.get('action', None) in ('store_true', 'store_false')]
-    )
-
+flagOPTIONS_runex=_get_flag_opts()
+
-
-if __name__=='__main__':