mirror of
https://github.com/ARM-software/devlib.git
synced 2025-02-24 21:47:50 +00:00
devlib: Fix incorrect imports
This commit is contained in:
parent
5d97c3186b
commit
b7a04c9ebc
devlib
@ -19,7 +19,7 @@ import tempfile
|
||||
import time
|
||||
import pexpect
|
||||
|
||||
from devlib.exception import TargetStableError, HostError
|
||||
from devlib.exception import HostError, TargetTransientError
|
||||
from devlib.host import PACKAGE_BIN_DIRECTORY
|
||||
from devlib.instrument import (Instrument, InstrumentChannel, MeasurementsCsv,
|
||||
Measurement, CONTINUOUS, INSTANTANEOUS)
|
||||
|
@ -29,7 +29,9 @@ from collections import namedtuple, defaultdict
|
||||
from devlib.host import LocalConnection, PACKAGE_BIN_DIRECTORY
|
||||
from devlib.module import get_module
|
||||
from devlib.platform import Platform
|
||||
from devlib.exception import DevlibTransientError, TargetStableError, TargetNotRespondingError, TimeoutError # pylint: disable=redefined-builtin
|
||||
from devlib.exception import (DevlibTransientError, TargetStableError,
|
||||
TargetNotRespondingError, TimeoutError,
|
||||
TargetTransientError) # pylint: disable=redefined-builtin
|
||||
from devlib.utils.ssh import SshConnection
|
||||
from devlib.utils.android import AdbConnection, AndroidProperties, LogcatMonitor, adb_command, adb_disconnect, INTENT_FLAGS
|
||||
from devlib.utils.misc import memoized, isiterable, convert_new_lines
|
||||
|
@ -20,7 +20,6 @@ from past.builtins import basestring, zip
|
||||
|
||||
from devlib.host import PACKAGE_BIN_DIRECTORY
|
||||
from devlib.trace import TraceCollector
|
||||
from devlib.exception import HostError
|
||||
from devlib.utils.misc import ensure_file_directory_exists as _f
|
||||
|
||||
|
||||
|
@ -29,7 +29,7 @@ import subprocess
|
||||
from collections import defaultdict
|
||||
import pexpect
|
||||
|
||||
from devlib.exception import TargetTransientError, TargetStableError, HostError, DevlibError
|
||||
from devlib.exception import TargetTransientError, TargetStableError, HostError
|
||||
from devlib.utils.misc import check_output, which, ABI_MAP
|
||||
from devlib.utils.misc import escape_single_quotes, escape_double_quotes
|
||||
|
||||
|
@ -38,7 +38,7 @@ from pexpect import EOF, TIMEOUT, spawn
|
||||
|
||||
# pylint: disable=redefined-builtin,wrong-import-position
|
||||
from devlib.exception import (HostError, TargetStableError, TargetNotRespondingError,
|
||||
TimeoutError)
|
||||
TimeoutError, TargetTransientError)
|
||||
from devlib.utils.misc import which, strip_bash_colors, check_output
|
||||
from devlib.utils.misc import (escape_single_quotes, escape_double_quotes,
|
||||
escape_spaces)
|
||||
|
Loading…
x
Reference in New Issue
Block a user