File tree Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change 4848from ..utils .provenance import write_provenance
4949from .. import config , logging , LooseVersion
5050from .. import __version__
51- from ..external .six import string_types
51+ from ..external .six import string_types , text_type
5252
5353nipype_version = LooseVersion (__version__ )
5454
@@ -1268,8 +1268,8 @@ def _process(drain=0):
12681268 except UnicodeDecodeError :
12691269 stderr = stderr .decode ("ISO-8859-1" )
12701270
1271- result ['stdout' ] = stdout .split ('\n ' )
1272- result ['stderr' ] = stderr .split ('\n ' )
1271+ result ['stdout' ] = text_type ( stdout ) .split (text_type ( '\n ' ) )
1272+ result ['stderr' ] = text_type ( stderr ) .split (text_type ( '\n ' ) )
12731273 result ['merged' ] = ''
12741274 if output == 'file' :
12751275 ret_code = proc .wait ()
@@ -1283,8 +1283,8 @@ def _process(drain=0):
12831283 result ['stdout' ] = []
12841284 result ['stderr' ] = []
12851285 result ['merged' ] = ''
1286- runtime .stderr = '\n ' .join (result ['stderr' ])
1287- runtime .stdout = '\n ' .join (result ['stdout' ])
1286+ runtime .stderr = text_type ( '\n ' ) .join (result ['stderr' ])
1287+ runtime .stdout = text_type ( '\n ' ) .join (result ['stdout' ])
12881288 runtime .merged = result ['merged' ]
12891289 runtime .returncode = proc .returncode
12901290 return runtime
You can’t perform that action at this time.
0 commit comments