Skip to content

Commit d234850

Browse files
committed
fix: check for version and handle stdout/err
1 parent 3c47710 commit d234850

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

nipype/interfaces/base.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,12 +1285,16 @@ def _process(drain=0):
12851285
result['stdout'] = []
12861286
result['stderr'] = []
12871287
result['merged'] = ''
1288-
runtime.stderr = bytes('\n'.join(result['stderr']), 'utf-8').decode('utf-8')
1289-
runtime.stdout = bytes('\n'.join(result['stdout']), 'utf-8').decode('utf-8')
1290-
if isinstance(result['merged'], list):
1291-
runtime.merged = [bytes(val).decode('utf-8')
1292-
for val in result['merged']]
1288+
if sys.version_info < (3,):
1289+
runtime.stderr = '\n'.join(result['stderr']).decode('utf-8')
1290+
runtime.stdout = '\n'.join(result['stdout']).decode('utf-8')
1291+
if isinstance(result['merged'], list):
1292+
runtime.merged = [val.decode('utf-8') for val in result['merged']]
1293+
else:
1294+
runtime.merged = result['merged']
12931295
else:
1296+
runtime.stderr = '\n'.join(result['stderr'])
1297+
runtime.stdout = '\n'.join(result['stdout'])
12941298
runtime.merged = result['merged']
12951299
runtime.returncode = proc.returncode
12961300
return runtime

0 commit comments

Comments
 (0)