diff options
| author | Simon Glass <sjg@chromium.org> | 2017-05-29 15:31:24 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2017-06-08 20:21:59 -0600 |
| commit | 5c724dc4403c63b86fef8cccd2baa47cfa870986 (patch) | |
| tree | 50b4d737cb95c8b7d7f16cfadbc7c5b8f96a0844 | |
| parent | 6f8abf765b9a8be4a32d84677cbbff1a1706b325 (diff) | |
patman: Don't convert input data to unicode
The communication filter reads data in blocks and converts each block to
unicode (if necessary) one at a time. In the unlikely event that a unicode
character in the input spans a block this will not work. We get an error
like:
UnicodeDecodeError: 'utf8' codec can't decode bytes in position 1022-1023:
unexpected end of data
There is no need to change the input to unicode, so the easiest fix is to
drop this feature.
Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
| -rw-r--r-- | tools/patman/cros_subprocess.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/patman/cros_subprocess.py b/tools/patman/cros_subprocess.py index 7c76014340..ebd4300dfd 100644 --- a/tools/patman/cros_subprocess.py +++ b/tools/patman/cros_subprocess.py @@ -190,8 +190,6 @@ class Popen(subprocess.Popen): # We will get an error on read if the pty is closed try: data = os.read(self.stdout.fileno(), 1024) - if isinstance(data, bytes): - data = data.decode('utf-8') except OSError: pass if data == "": @@ -207,8 +205,6 @@ class Popen(subprocess.Popen): # We will get an error on read if the pty is closed try: data = os.read(self.stderr.fileno(), 1024) - if isinstance(data, bytes): - data = data.decode('utf-8') except OSError: pass if data == "": |