diff options
| author | Daniel Kurtz <djkurtz@chromium.org> | 2019-05-02 10:15:57 -0600 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-05-02 21:02:51 -0700 |
| commit | 781170c47b6078e1f9588d2b3fa1c23d208b0e88 (patch) | |
| tree | 1fa0206899eb7bb3dd19e72c48d202f5e4fff636 /extra/tigertool | |
| parent | 1d8aa53e02e66e878be02532e8a83ca78b7ceb9a (diff) | |
| download | chrome-ec-781170c47b6078e1f9588d2b3fa1c23d208b0e88.tar.gz | |
ec-devutils: Fix fdpexpect import
As of pexpect 3.0, the fdexpect module was moved into the pexpect
package. Prior to 4.0, a wrapper module was installed along with
pexpect, so "import fdexpect" continued to work. In 4.0 this wrapper
was removed.
Importing fdexpect from pexpect works for our current pexpect 3.3, and
will continue to work when we update pexpect to 4.0+.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
BRANCH=none
BUG=chromium:958677
TEST=(0) with pexpect 3.3, (1) sudo servod --board=grunt
TEST=(0) Uprev pexpect to 4.2.1, (1) sudo servod --board=grunt
=> servod works in both cases
Change-Id: I9d21042713d0cc1826cf55da4af7a16f44b746bb
Reviewed-on: https://chromium-review.googlesource.com/1593419
Commit-Ready: Daniel Kurtz <djkurtz@chromium.org>
Tested-by: Daniel Kurtz <djkurtz@chromium.org>
Tested-by: Scott Collyer <scollyer@chromium.org>
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
Reviewed-by: Scott Collyer <scollyer@chromium.org>
Diffstat (limited to 'extra/tigertool')
| -rw-r--r-- | extra/tigertool/ecusb/pty_driver.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/extra/tigertool/ecusb/pty_driver.py b/extra/tigertool/ecusb/pty_driver.py index 0802675634..2aec6fecad 100644 --- a/extra/tigertool/ecusb/pty_driver.py +++ b/extra/tigertool/ecusb/pty_driver.py @@ -14,8 +14,7 @@ import errno import fcntl import os import pexpect -import fdpexpect - +from pexpect import fdpexpect # Expecting a result in 3 seconds is plenty even for slow platforms. DEFAULT_UART_TIMEOUT = 3 |