moved convience functions out of core extproc for better thematic co…

…nsistency

convience.py

@@ -0,0 +1,58 @@
+import tempfile
+from extproc import Sh, Cmd, Pipe
+
+def here(string):
+    """
+    Make a temporary file from a string for use in redirection.
+    """
+    t = tempfile.TemporaryFile()
+    t.write(string)
+    t.seek(0)
+    return t
+
+def run(cmd, fd={}, e={}, cd=None):
+    """
+    Perform a fork-exec-wait of a Cmd and return its exit status.
+    """
+    return Cmd(cmd, fd=fd, e=e, cd=cd).run()
+
+def cmd(cmd, fd={}, e={}, cd=None):
+    """
+    Perform a fork-exec-wait of a Cmd and return the its stdout
+    as a byte string.
+    """
+    f = Cmd(cmd, fd=fd, e=e, cd=cd).capture(1).stdout
+    try:
+        s = f.read()
+    finally:
+        f.close()
+    return s
+
+def sh(cmd, fd={}, e={}, cd=None):
+    """
+    Perform a fork-exec-wait of a Sh command and return its stdout
+    as a byte string.
+    """
+    f = Sh(cmd, fd=fd, e=e, cd=cd).capture(1).stdout
+    try:
+        s = f.read()
+    finally:
+        f.close()
+    return s
+
+def pipe(*cmds, **kwargs):
+  """
+  Run the pipeline with given Cmd's, then returns its stdout as a byte string.
+  """
+  f = Pipe(*cmds, **kwargs).capture(1).stdout
+  try:
+      s = f.read()
+  finally:
+      f.close()
+  return s
+
+def spawn(cmd, fd={}, e={}, cd=None, sh=False):
+    if sh:
+        return Sh(cmd, fd=fd, e=e, cd=cd).spawn()
+    else:
+        return Cmd(cmd, fd=fd, e=e, cd=cd).spawn()

extproc.py

@@ -458,62 +458,6 @@ def capture(self, *fd):
         return Capture(
             self.fd[1], self.fd[2], [c.p.returncode for c in self.cmds])
 
-def here(string):
-    """
-    Make a temporary file from a string for use in redirection.
-    """
-    t = tempfile.TemporaryFile()
-    t.write(string)
-    t.seek(0)
-    return t
-
-def run(cmd, fd={}, e={}, cd=None):
-    """
-    Perform a fork-exec-wait of a Cmd and return its exit status.
-    """
-    return Cmd(cmd, fd=fd, e=e, cd=cd).run()
-
-def cmd(cmd, fd={}, e={}, cd=None):
-    """
-    Perform a fork-exec-wait of a Cmd and return the its stdout
-    as a byte string.
-    """
-    f = Cmd(cmd, fd=fd, e=e, cd=cd).capture(1).stdout
-    try:
-        s = f.read()
-    finally:
-        f.close()
-    return s
-
-def sh(cmd, fd={}, e={}, cd=None):
-    """
-    Perform a fork-exec-wait of a Sh command and return its stdout
-    as a byte string.
-    """
-    f = Sh(cmd, fd=fd, e=e, cd=cd).capture(1).stdout
-    try:
-        s = f.read()
-    finally:
-        f.close()
-    return s
-
-def pipe(*cmds, **kwargs):
-  """
-  Run the pipeline with given Cmd's, then returns its stdout as a byte string.
-  """
-  f = Pipe(*cmds, **kwargs).capture(1).stdout
-  try:
-      s = f.read()
-  finally:
-      f.close()
-  return s
-
-def spawn(cmd, fd={}, e={}, cd=None, sh=False):
-    if sh:
-        return Sh(cmd, fd=fd, e=e, cd=cd).spawn()
-    else:
-        return Cmd(cmd, fd=fd, e=e, cd=cd).spawn()
-
 if __name__ == '__main__':
     import doctest
     n = doctest.testmod().failed

test_extproc.py

@@ -3,8 +3,8 @@
 import time
 import os
 import tempfile
-from extproc import (
-    run, Sh, sh, Pipe, pipe, Cmd, here, JOBS, cmd)
+from extproc import Sh, Pipe, Cmd, JOBS
+from convience import run, sh, pipe, here, cmd
 STDIN, STDOUT, STDERR = 0, 1, 2
 
 def sh_strip(in_):