File tree Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Original file line number Diff line number Diff line change 1919from copy import deepcopy
2020import datetime
2121import errno
22+ import locale
2223import os
2324import re
2425import platform
@@ -1258,17 +1259,17 @@ def _process(drain=0):
12581259 stdout , stderr = proc .communicate ()
12591260 if stdout and isinstance (stdout , bytes ):
12601261 try :
1261- stdout = stdout .decode ()
1262+ stdout = stdout .decode (locale . getdefaultlocale ()[ 1 ] )
12621263 except UnicodeDecodeError :
12631264 stdout = stdout .decode ("ISO-8859-1" )
12641265 if stderr and isinstance (stderr , bytes ):
12651266 try :
1266- stderr = stderr .decode ()
1267+ stderr = stderr .decode (locale . getdefaultlocale ()[ 1 ] )
12671268 except UnicodeDecodeError :
12681269 stderr = stderr .decode ("ISO-8859-1" )
12691270
1270- result ['stdout' ] = str ( stdout ) .split ('\n ' )
1271- result ['stderr' ] = str ( stderr ) .split ('\n ' )
1271+ result ['stdout' ] = stdout .split ('\n ' )
1272+ result ['stderr' ] = stderr .split ('\n ' )
12721273 result ['merged' ] = ''
12731274 if output == 'file' :
12741275 ret_code = proc .wait ()
You can’t perform that action at this time.
0 commit comments