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 48
48
from ..utils .provenance import write_provenance
49
49
from .. import config , logging , LooseVersion
50
50
from .. import __version__
51
- from ..external .six import string_types
51
+ from ..external .six import string_types , text_type
52
52
53
53
nipype_version = LooseVersion (__version__ )
54
54
@@ -1268,8 +1268,8 @@ def _process(drain=0):
1268
1268
except UnicodeDecodeError :
1269
1269
stderr = stderr .decode ("ISO-8859-1" )
1270
1270
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 ' ) )
1273
1273
result ['merged' ] = ''
1274
1274
if output == 'file' :
1275
1275
ret_code = proc .wait ()
@@ -1283,8 +1283,8 @@ def _process(drain=0):
1283
1283
result ['stdout' ] = []
1284
1284
result ['stderr' ] = []
1285
1285
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' ])
1288
1288
runtime .merged = result ['merged' ]
1289
1289
runtime .returncode = proc .returncode
1290
1290
return runtime
You can’t perform that action at this time.
0 commit comments