fix: cleaned up based on matthew's feedback

Author: satra

nipype/interfaces/base.py

@@ -1257,19 +1257,18 @@ def _process(drain=0):
         result['merged'] = [r[1] for r in temp]
     if output == 'allatonce':
         stdout, stderr = proc.communicate()
-        if stdout and isinstance(stdout, bytes):
+        if isinstance(stdout, bytes):
             try:
                 stdout = stdout.decode(locale.getdefaultlocale()[1])
             except UnicodeDecodeError:
                 stdout = stdout.decode("ISO-8859-1")
-        if stderr and isinstance(stderr, bytes):
+        if isinstance(stderr, bytes):
             try:
                 stderr = stderr.decode(locale.getdefaultlocale()[1])
             except UnicodeDecodeError:
                 stderr = stderr.decode("ISO-8859-1")
-
-        result['stdout'] = text_type(stdout).split(text_type('\n'))
-        result['stderr'] = text_type(stderr).split(text_type('\n'))
+        result['stdout'] = stdout.split('\n')
+        result['stderr'] = stderr.split('\n')
         result['merged'] = ''
     if output == 'file':
         ret_code = proc.wait()
@@ -1283,8 +1282,8 @@ def _process(drain=0):
         result['stdout'] = []
         result['stderr'] = []
         result['merged'] = ''
-    runtime.stderr = text_type('\n').join(result['stderr'])
-    runtime.stdout = text_type('\n').join(result['stdout'])
+    runtime.stderr = text_type('\n'.join(result['stderr']))
+    runtime.stdout = text_type('\n'.join(result['stdout']))
     runtime.merged = result['merged']
     runtime.returncode = proc.returncode
     return runtime

nipype/interfaces/spm/tests/test_base.py

@@ -12,7 +12,7 @@
 from nipype.interfaces.spm import no_spm
 import nipype.interfaces.matlab as mlab
 from nipype.interfaces.spm.base import SPMCommandInputSpec
-from nipype.interfaces.base import traits
+from nipype.interfaces.base import traits, text_type
 
 try:
     matlab_cmd = os.environ['MATLABCMD']
@@ -57,7 +57,7 @@ def test_scan_for_fnames():
     def test_spm_path():
         spm_path = spm.Info.version()['path']
         if spm_path is not None:
-            yield assert_equal, type(spm_path), type('')
+            yield assert_equal, type(spm_path), text_type
             yield assert_true, 'spm' in spm_path
 
 

nipype/interfaces/tests/test_base.py

@@ -655,17 +655,17 @@ def test_CommandLine_output():
     ci = nib.CommandLine(command='ls -l')
     ci.inputs.terminal_output = 'allatonce'
     res = ci.run()
-    yield assert_equal, text_type(res.runtime.merged), text_type('')
+    yield assert_equal, res.runtime.merged, ''
     yield assert_true, name in res.runtime.stdout
     ci = nib.CommandLine(command='ls -l')
     ci.inputs.terminal_output = 'file'
     res = ci.run()
     yield assert_true, 'stdout.nipype' in res.runtime.stdout
-    yield assert_equal, type(text_type(res.runtime.stdout)), type(text_type('hi'))
+    yield assert_equal, type(res.runtime.stdout), text_type
     ci = nib.CommandLine(command='ls -l')
     ci.inputs.terminal_output = 'none'
     res = ci.run()
-    yield assert_equal, text_type(res.runtime.stdout), text_type('')
+    yield assert_equal, res.runtime.stdout, ''
     ci = nib.CommandLine(command='ls -l')
     res = ci.run()
     yield assert_true, 'stdout.nipype' in res.runtime.stdout