ClearML/wexpect-venv
1
0
Fork 0
mirror of https://github.com/clearml/wexpect-venv synced 2025-02-12 07:38:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix throw UnicodeDecodeError #47

Browse Source
This commit is contained in:
CatSlave007 2021-01-25 17:31:55 +08:00 committed by raczben
parent c8977d8460
commit d2cf84a9a9
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wexpect/host.py
View File

@ -147,11 +147,13 @@ def run(command, timeout=-1, withexitstatus=False, events=None, extra_args=None,
else: else:
return child_result return child_result
return s.decode(encoding=self.encoding, errors=self.decode_errors)
class SpawnBase: class SpawnBase:
def __init__(self, command, args=[], timeout=30, maxread=60000, searchwindowsize=None, def __init__(self, command, args=[], timeout=30, encoding='UTF-8', decode_errors='ignore',
logfile=None, cwd=None, env=None, codepage=None, echo=True, safe_exit=True, maxread=60000, searchwindowsize=None, logfile=None, cwd=None, env=None,
interact=False, coverage_console_reader=False, **kwargs): codepage=None, echo=True, safe_exit=True, interact=False,
coverage_console_reader=False, **kwargs):
"""This starts the given command in a child process. This does all the """This starts the given command in a child process. This does all the
fork/exec type of stuff for a pty. This is called by __init__. If args fork/exec type of stuff for a pty. This is called by __init__. If args
is empty then command will be parsed (split on spaces) and args will be is empty then command will be parsed (split on spaces) and args will be
@ -171,6 +173,8 @@ class SpawnBase:
self.console_pid = None self.console_pid = None
self.child_process = None self.child_process = None
self.child_pid = None self.child_pid = None
self.encoding = encoding
self.decode_errors = decode_errors
self.safe_exit = safe_exit self.safe_exit = safe_exit
self.searcher = None self.searcher = None
@ -950,7 +954,7 @@ class SpawnPipe(SpawnBase):
logger.info("EOF: EOF character has been arrived") logger.info("EOF: EOF character has been arrived")
s = s.split(EOF_CHAR)[0] s = s.split(EOF_CHAR)[0]
return s.decode() return s.decode(encoding=self.encoding, errors=self.decode_errors)
except pywintypes.error as e: except pywintypes.error as e:
if e.args[0] == winerror.ERROR_BROKEN_PIPE: # 109 if e.args[0] == winerror.ERROR_BROKEN_PIPE: # 109
self.flag_eof = True self.flag_eof = True
@ -1077,7 +1081,7 @@ class SpawnSocket(SpawnBase):
except socket.timeout: except socket.timeout:
return '' return ''
return s.decode() return s.decode(encoding=self.encoding, errors=self.decode_errors)
class searcher_re (object): class searcher_re (object):