File tree Expand file tree Collapse file tree 1 file changed +9
-5
lines changed Expand file tree Collapse file tree 1 file changed +9
-5
lines changed Original file line number Diff line number Diff line change @@ -1285,12 +1285,16 @@ def _process(drain=0):
1285
1285
result ['stdout' ] = []
1286
1286
result ['stderr' ] = []
1287
1287
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' ]
1293
1295
else :
1296
+ runtime .stderr = '\n ' .join (result ['stderr' ])
1297
+ runtime .stdout = '\n ' .join (result ['stdout' ])
1294
1298
runtime .merged = result ['merged' ]
1295
1299
runtime .returncode = proc .returncode
1296
1300
return runtime
You can’t perform that action at this time.
0 commit comments