Merge pull request #789 from carlohamalainen/master

Don't call subprocess.Popen twice when output == 'file'.

Author: satra

nipype/interfaces/base.py

@@ -1109,12 +1109,26 @@ def run_command(runtime, output=None, timeout=0.01):
     The returned runtime contains a merged stdout+stderr log with timestamps
     """
     PIPE = subprocess.PIPE
-    proc = subprocess.Popen(runtime.cmdline,
-                             stdout=PIPE,
-                             stderr=PIPE,
-                             shell=True,
-                             cwd=runtime.cwd,
-                             env=runtime.environ)
+
+    if output == 'file':
+        errfile = os.path.join(runtime.cwd, 'stderr.nipype')
+        outfile = os.path.join(runtime.cwd, 'stdout.nipype')
+        stderr = open(errfile, 'wt')
+        stdout = open(outfile, 'wt')
+
+        proc = subprocess.Popen(runtime.cmdline,
+                                stdout=stdout,
+                                stderr=stderr,
+                                shell=True,
+                                cwd=runtime.cwd,
+                                env=runtime.environ)
+    else:
+        proc = subprocess.Popen(runtime.cmdline,
+                                 stdout=PIPE,
+                                 stderr=PIPE,
+                                 shell=True,
+                                 cwd=runtime.cwd,
+                                 env=runtime.environ)
     result = {}
     errfile = os.path.join(runtime.cwd, 'stderr.nipype')
     outfile = os.path.join(runtime.cwd, 'stdout.nipype')
@@ -1154,14 +1168,6 @@ def _process(drain=0):
         result['stderr'] = stderr.split('\n')
         result['merged'] = ''
     if output == 'file':
-        stderr = open(errfile, 'wt')
-        stdout = open(outfile, 'wt')
-        proc = subprocess.Popen(runtime.cmdline,
-                                stdout=stdout,
-                                stderr=stderr,
-                                shell=True,
-                                cwd=runtime.cwd,
-                                env=runtime.environ)
         ret_code = proc.wait()
         stderr.flush()
         stdout.flush()