From b7a04c9ebc950f18a532b3173468ce6958c0586c Mon Sep 17 00:00:00 2001
From: Marc Bonnici <marc.bonnici@arm.com>
Date: Thu, 20 Sep 2018 10:51:29 +0100
Subject: [PATCH] devlib: Fix incorrect imports

---
 devlib/platform/arm.py  | 2 +-
 devlib/target.py        | 4 +++-
 devlib/trace/perf.py    | 1 -
 devlib/utils/android.py | 2 +-
 devlib/utils/ssh.py     | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/devlib/platform/arm.py b/devlib/platform/arm.py
index 4dbf98f..97b0941 100644
--- a/devlib/platform/arm.py
+++ b/devlib/platform/arm.py
@@ -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)
diff --git a/devlib/target.py b/devlib/target.py
index da7260a..c32653e 100644
--- a/devlib/target.py
+++ b/devlib/target.py
@@ -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
diff --git a/devlib/trace/perf.py b/devlib/trace/perf.py
index 368f57d..5d5ac9b 100644
--- a/devlib/trace/perf.py
+++ b/devlib/trace/perf.py
@@ -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
 
 
diff --git a/devlib/utils/android.py b/devlib/utils/android.py
index 719d2eb..ef3cb01 100755
--- a/devlib/utils/android.py
+++ b/devlib/utils/android.py
@@ -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
 
diff --git a/devlib/utils/ssh.py b/devlib/utils/ssh.py
index f25d6cd..e493ffb 100644
--- a/devlib/utils/ssh.py
+++ b/devlib/utils/ssh.py
@@ -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)