]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
python-common: Fix wrong type annotation 34824/head
authorSebastian Wagner <sebastian.wagner@suse.com>
Wed, 29 Apr 2020 11:22:22 +0000 (13:22 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Wed, 29 Apr 2020 11:22:22 +0000 (13:22 +0200)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
src/python-common/ceph/deployment/drive_selection/selector.py
src/python-common/ceph/deployment/inventory.py
src/python-common/ceph/tests/utils.py

index ff71803003abe0ffabfbe2a5e3c6e5c3ae2dcf2b..cdc21caa52ff2a6d6622b6f79f9ead16bd023bee 100644 (file)
@@ -5,9 +5,7 @@ try:
 except ImportError:
     pass
 
-from ceph.deployment.inventory import Device
-
-from ..inventory import Devices
+from ..inventory import Device
 from ..drive_group import DriveGroupSpec, DeviceSelection
 
 from .filter import FilterGenerator
@@ -18,7 +16,7 @@ logger = logging.getLogger(__name__)
 class DriveSelection(object):
     def __init__(self,
                  spec,  # type: DriveGroupSpec
-                 disks,  # type: Devices
+                 disks,  # type: List[Device]
                  ):
         self.disks = disks.copy()
         self.spec = spec
index 361adf3c36845f828bcef8e4c7f1c5067cf921eb..94dcb5024b5bd6ab39fce30398a91cab5ced854d 100644 (file)
@@ -28,6 +28,7 @@ class Devices(object):
         return cls([Device.from_json(i) for i in input])
 
     def copy(self):
+        # type: () -> Devices
         return Devices(devices=list(self.devices))
 
 
index 2d714a6b2038fa15da111ace69da82cd3dd24e81..ebba43094bc10451044d7d459c366753d80d7fde 100644 (file)
@@ -1,5 +1,10 @@
 from ceph.deployment.inventory import Devices, Device
 
+try:
+    from typing import Any, List
+except ImportError:
+    pass  # for type checking
+
 
 def _mk_device(rotational=True,
                locked=False,
@@ -29,6 +34,7 @@ def _mk_device(rotational=True,
 
 
 def _mk_inventory(devices):
+    # type: (Any) -> List[Device]
     devs = []
     for dev_, name in zip(devices, map(chr, range(ord('a'), ord('z')))):
         dev = Device.from_json(dev_.to_json())