utils: move Error and TimeoutError to utils/type_utils.py
These Exception subclasses are better suited to all be stored in
one location under py/utils/*.
CQ-DEPEND=CL:231650
BUG=None
TEST=Test manually with `repo upload`
Change-Id: I3bdd583b9980533fcbbb2abbb597a2a89764efc8
Reviewed-on: https://chromium-review.googlesource.com/231646
Reviewed-by: Joel Kitching <kitching@google.com>
Tested-by: Joel Kitching <kitching@google.com>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Commit-Queue: Joel Kitching <kitching@google.com>
diff --git a/py/gooftool/gooftool.py b/py/gooftool/gooftool.py
index e6bcbc9..f871295 100755
--- a/py/gooftool/gooftool.py
+++ b/py/gooftool/gooftool.py
@@ -29,7 +29,7 @@
import factory_common # pylint: disable=W0611
from cros.factory import event_log
-from cros.factory.common import Error, SetupLogging, Shell
+from cros.factory.common import SetupLogging, Shell
from cros.factory.gooftool import Gooftool
from cros.factory.gooftool import crosfw
from cros.factory.gooftool import report_upload
@@ -47,6 +47,7 @@
from cros.factory.test.factory import FACTORY_LOG_PATH, DEVICE_STATEFUL_PATH
from cros.factory.utils import file_utils
from cros.factory.utils.process_utils import Spawn
+from cros.factory.utils.type_utils import Error
from cros.factory.privacy import FilterDict