]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/orch: cleanup python imports
authorSebastian Wagner <sebastian.wagner@suse.com>
Wed, 15 Apr 2020 12:57:54 +0000 (14:57 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Wed, 22 Apr 2020 13:06:38 +0000 (15:06 +0200)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 62ed783dc243e076e00be93ea8ab2dd1fb262d58)

src/pybind/mgr/orchestrator/module.py

index cea421fe651d7702179f309f87c32432ebf79d3e..f4580a2fe2356477d070712bcf3888dd3a8c4699 100644 (file)
@@ -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, \