File tree Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -1285,9 +1285,13 @@ def _process(drain=0):
1285
1285
result ['stdout' ] = []
1286
1286
result ['stderr' ] = []
1287
1287
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' ]
1291
1295
runtime .returncode = proc .returncode
1292
1296
return runtime
1293
1297
You can’t perform that action at this time.
0 commit comments