From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Wed, 15 Apr 2020 12:57:54 +0000 (+0200)
Subject: mgr/orch: cleanup python imports
X-Git-Tag: wip-pdonnell-testing-20200918.022351~1480^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=62ed783dc243e076e00be93ea8ab2dd1fb262d58;p=ceph-ci.git

mgr/orch: cleanup python imports

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py
index 97a8a496283..b2ed64f03cd 100644
--- a/src/pybind/mgr/orchestrator/module.py
+++ b/src/pybind/mgr/orchestrator/module.py
@@ -1,24 +1,17 @@
 import datetime
 import errno
 import json
-import yaml
+from typing import List, Set, Optional, Iterator
 
+import yaml
 import six
-
-from ceph.deployment.inventory import Device
 from prettytable import PrettyTable
 
-from mgr_util import format_bytes, to_pretty_timedelta
-
-try:
-    from typing import List, Set, Optional, Dict, Iterator
-except ImportError:
-    pass  # just for type checking.
-
-
+from ceph.deployment.inventory import Device
 from ceph.deployment.drive_group import DriveGroupSpec, DeviceSelection
-
 from ceph.deployment.service_spec import PlacementSpec, ServiceSpec
+
+from mgr_util import format_bytes, to_pretty_timedelta
 from mgr_module import MgrModule, HandleCommandResult
 
 from ._interface import OrchestratorClientMixin, DeviceLightLoc, _cli_read_command, \