From ea085d6839256a8086ebe0587fe5fbf1d2f0a1b9 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Wed, 29 Apr 2020 13:22:22 +0200 Subject: [PATCH] python-common: Fix wrong type annotation Signed-off-by: Sebastian Wagner --- .../ceph/deployment/drive_selection/selector.py | 6 ++---- src/python-common/ceph/deployment/inventory.py | 1 + src/python-common/ceph/tests/utils.py | 6 ++++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/python-common/ceph/deployment/drive_selection/selector.py b/src/python-common/ceph/deployment/drive_selection/selector.py index ff71803003abe..cdc21caa52ff2 100644 --- a/src/python-common/ceph/deployment/drive_selection/selector.py +++ b/src/python-common/ceph/deployment/drive_selection/selector.py @@ -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 diff --git a/src/python-common/ceph/deployment/inventory.py b/src/python-common/ceph/deployment/inventory.py index 361adf3c36845..94dcb5024b5bd 100644 --- a/src/python-common/ceph/deployment/inventory.py +++ b/src/python-common/ceph/deployment/inventory.py @@ -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)) diff --git a/src/python-common/ceph/tests/utils.py b/src/python-common/ceph/tests/utils.py index 2d714a6b2038f..ebba43094bc10 100644 --- a/src/python-common/ceph/tests/utils.py +++ b/src/python-common/ceph/tests/utils.py @@ -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()) -- 2.39.5