Skip to content

Commit 3c47710

Browse files
committed
fix: test errors and ensure string gets encode into bytes as utf-8
1 parent 678c3f1 commit 3c47710

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

nipype/interfaces/base.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,9 +1285,13 @@ def _process(drain=0):
12851285
result['stdout'] = []
12861286
result['stderr'] = []
12871287
result['merged'] = ''
1288-
runtime.stderr = bytes('\n'.join(result['stderr'])).decode('utf-8')
1289-
runtime.stdout = bytes('\n'.join(result['stdout'])).decode('utf-8')
1290-
runtime.merged = [bytes(val).decode('utf-8') for val in 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']]
1293+
else:
1294+
runtime.merged = result['merged']
12911295
runtime.returncode = proc.returncode
12921296
return runtime
12931297

0 commit comments

Comments
 (0)