diff options
author | Yilin Yang <kerker@google.com> | 2020-09-23 14:57:09 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-09-26 02:04:19 +0000 |
commit | dac57f3eb1cad9e181ea7efa130299a473db50a6 (patch) | |
tree | 06889a1ebc1bca14bb9d970b490e6accb49284ac /extra/tigertool/ecusb/tiny_servo_common.py | |
parent | d888a8e84e8739cc4d3e89f7c534b49e360e34ad (diff) | |
download | chrome-ec-dac57f3eb1cad9e181ea7efa130299a473db50a6.tar.gz |
usb_updater: Migrate servo_updater.py to python2/3 compatible
BUG=chromium:1031705
BRANCH=master
TEST=`sudo python3 ./extra/usb_updater/servo_updater.py -b servo_v4
--force` shows "update complete".
TEST=`sudo python2 ./extra/usb_updater/servo_updater.py -b servo_v4
--force` shows "update complete".
Signed-off-by: kerker <kerker@chromium.org>
Change-Id: I632203b9eca4aa99dc63063c37f0ab5fc2e54dbb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2425784
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'extra/tigertool/ecusb/tiny_servo_common.py')
-rw-r--r-- | extra/tigertool/ecusb/tiny_servo_common.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/extra/tigertool/ecusb/tiny_servo_common.py b/extra/tigertool/ecusb/tiny_servo_common.py index 185f2a67d1..0e650a2d1d 100644 --- a/extra/tigertool/ecusb/tiny_servo_common.py +++ b/extra/tigertool/ecusb/tiny_servo_common.py @@ -12,8 +12,8 @@ import subprocess import sys import time -import pty_driver -import stm32uart +from . import pty_driver +from . import stm32uart class TinyServoError(Exception): @@ -40,7 +40,8 @@ def check_usb(vidpid, serialname=None): Returns: True if found, False, otherwise. """ if serialname: - output = subprocess.check_output(['lsusb', '-v', '-d', vidpid]) + output = subprocess.check_output(['lsusb', '-v', '-d', vidpid], + encoding='utf-8') m = re.search(r'^\s*iSerial\s+\d+\s+%s$' % serialname, output, flags=re.M) if m: return True @@ -63,7 +64,8 @@ def check_usb_sn(vidpid): Returns: string serial number if found, None otherwise. """ - output = subprocess.check_output(['lsusb', '-v', '-d', vidpid]) + output = subprocess.check_output(['lsusb', '-v', '-d', vidpid], + encoding='utf-8') m = re.search(r'^\s*iSerial\s+(.*)$', output, flags=re.M) if m: return m.group(1) |