diff options
| author | Yilin Yang <kerker@google.com> | 2020-09-26 14:20:59 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-09-26 17:42:09 +0000 |
| commit | 4a3afc38aa147d5b7feff62984b538a3c7428db0 (patch) | |
| tree | 923003d5d63165d8ee8cae0003e35ed5f5964dfa /extra/usb_updater/servo_updater.py | |
| parent | 9f7652717c2a4260297f4d2003c3aa09cde45468 (diff) | |
| download | chrome-ec-4a3afc38aa147d5b7feff62984b538a3c7428db0.tar.gz | |
ecusb: Fix subprocess argument to make it py2/3 compatible
BUG=chromium:1031705
BRANCH=master
TEST=None
Signed-off-by: kerker <kerker@chromium.org>
Change-Id: I78713f635e00cf01e1df641436b3a6d2f5c3c00b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2431318
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Diffstat (limited to 'extra/usb_updater/servo_updater.py')
| -rwxr-xr-x | extra/usb_updater/servo_updater.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/extra/usb_updater/servo_updater.py b/extra/usb_updater/servo_updater.py index 397aa28566..80a63636d8 100755 --- a/extra/usb_updater/servo_updater.py +++ b/extra/usb_updater/servo_updater.py @@ -16,7 +16,6 @@ import time import tempfile import json -import six import fw_update import ecusb.tiny_servo_common as c @@ -240,13 +239,9 @@ def find_available_version(boardname, binfile): Returns: the version string. """ - args = {} - if six.PY3: - args['encoding'] = 'utf-8' - rawstrings = subprocess.check_output( ['cbfstool', binfile, 'read', '-r', 'RO_FRID', '-f', '/dev/stdout'], - **args) + **c.get_subprocess_args()) m = re.match(r'%s_v\S+' % boardname, rawstrings) if m: newvers = m.group(0).strip(' \t\r\n\0') |