SF.net SVN: safekeep:[709] safekeep/trunk/safekeep

[<di...@us...>]

Revision: 709
          http://safekeep.svn.sourceforge.net/safekeep/?rev=709&view=rev
Author:   dimi
Date:     2010-11-21 20:10:12 +0000 (Sun, 21 Nov 2010)

Log Message:
-----------
Fix the fallback for the subprocess module, use it when available

Modified Paths:
--------------
    safekeep/trunk/safekeep

Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep	2010-11-21 20:01:20 UTC (rev 708)
+++ safekeep/trunk/safekeep	2010-11-21 20:10:12 UTC (rev 709)
@@ -24,9 +24,11 @@
 try:
     import subprocess
     from subprocess import PIPE, STDOUT
+    use_subprocess = True
 except:
     PIPE = -1
     STDOUT = -2
+    use_subprocess = False
 
 ######################################################################
 # Global settings
@@ -128,16 +130,13 @@
     else:
         _stderr = STDOUT
 
-    if 'subprocess' in dir():
+    if use_subprocess:
         proc = subprocess.Popen(args, bufsize=1, shell=_shell, stdin=_stdin, stdout=PIPE, stderr=_stderr, close_fds=True)
         child_in = proc.stdin
         child_out = proc.stdout
-        def do_wait():
-            return proc_wait()
-
     else:
         if _shell:
-            args = ["/bin/sh", "-c"].extend(args)
+            args = ["/bin/sh", "-c", args]
         if _stderr:
             (child_in, child_out) = os.popen4(args)
         else:
@@ -146,9 +145,6 @@
         if not stdin:
             child_in.close()
         
-        def do_wait():
-            return 0
-
     if stdin:
         child_in.write(stdin)
         child_in.close()
@@ -160,8 +156,13 @@
         else:
             info(line.rstrip())
     child_out.close()
-    return (do_wait(), ''.join(lines))
 
+    if use_subprocess:
+        return (proc.wait(), ''.join(lines))
+    else:
+        return (0, ''.join(lines))
+        
+
 def _spawn(args, stdin=None, stdout=False):
     if isinstance(args, types.StringTypes):
         cmd = args.split(None)[0]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.