File tree Expand file tree Collapse file tree 1 file changed +10
-6
lines changed Expand file tree Collapse file tree 1 file changed +10
-6
lines changed Original file line number Diff line number Diff line change @@ -1420,19 +1420,23 @@ def _process(drain=0):
1420
1420
1421
1421
if output == 'allatonce' :
1422
1422
stdout , stderr = proc .communicate ()
1423
- result ['stdout' ] = stdout .decode (default_encoding ).split ('\n ' )
1424
- result ['stderr' ] = stderr .decode (default_encoding ).split ('\n ' )
1423
+ result ['stdout' ] = stdout .decode (
1424
+ default_encoding , errors = 'replace' ).split ('\n ' )
1425
+ result ['stderr' ] = stderr .decode (
1426
+ default_encoding , errors = 'replace' ).split ('\n ' )
1425
1427
1426
1428
elif output .startswith ('file' ):
1427
1429
proc .wait ()
1428
1430
if outfile is not None :
1429
1431
stdout .flush ()
1430
- result ['stdout' ] = [line .decode (default_encoding ).strip ()
1431
- for line in open (outfile , 'rb' ).readlines ()]
1432
+ result ['stdout' ] = [
1433
+ line .decode (default_encoding , errors = 'replace' ).strip ()
1434
+ for line in open (outfile , 'rb' ).readlines ()]
1432
1435
if errfile is not None :
1433
1436
stderr .flush ()
1434
- result ['stderr' ] = [line .decode (default_encoding ).strip ()
1435
- for line in open (errfile , 'rb' ).readlines ()]
1437
+ result ['stderr' ] = [
1438
+ line .decode (default_encoding , errors = 'replace' ).strip ()
1439
+ for line in open (errfile , 'rb' ).readlines ()]
1436
1440
1437
1441
if output == 'file' :
1438
1442
result ['merged' ] = result ['stdout' ]
You can’t perform that action at this time.
0 commit comments