Remove deprecated integration classes (#1343)

The following previously deprecated classes exist no more:
* AirFreshVA4 - use AirFresh
* AirHumidifierCA1, AirHumidifierCB1, AirHumidifierCB2 - use AirHumidifier
* AirDogX5, AirDogX7SM - use AirDogX3
* AirPurifierMB4 - use AirPurifierMiot
* Plug, PlugV1, PlugV3 - use ChuangmiPlug
* FanP9, FanP10, FanP11 - use FanMiot
* DreameVacuumMiot - use DreameVacuum
* Vacuum - use RoborockVacuum

Author: rytilahti

miio/__init__.py

@@ -21,28 +21,28 @@
 )
 from miio.airconditioningcompanionMCN import AirConditioningCompanionMcn02
 from miio.airdehumidifier import AirDehumidifier
-from miio.airfresh import AirFresh, AirFreshVA4
+from miio.airfresh import AirFresh
 from miio.airfresh_t2017 import AirFreshA1, AirFreshT2017
-from miio.airhumidifier import AirHumidifier, AirHumidifierCA1, AirHumidifierCB1
+from miio.airhumidifier import AirHumidifier
 from miio.airhumidifier_jsq import AirHumidifierJsq
 from miio.airhumidifier_miot import AirHumidifierMiot
 from miio.airhumidifier_mjjsq import AirHumidifierMjjsq
 from miio.airpurifier import AirPurifier
-from miio.airpurifier_airdog import AirDogX3, AirDogX5, AirDogX7SM
-from miio.airpurifier_miot import AirPurifierMB4, AirPurifierMiot
+from miio.airpurifier_airdog import AirDogX3
+from miio.airpurifier_miot import AirPurifierMiot
 from miio.airqualitymonitor import AirQualityMonitor
 from miio.airqualitymonitor_miot import AirQualityMonitorCGDN1
 from miio.aqaracamera import AqaraCamera
 from miio.chuangmi_camera import ChuangmiCamera
 from miio.chuangmi_ir import ChuangmiIr
-from miio.chuangmi_plug import ChuangmiPlug, Plug, PlugV1, PlugV3
+from miio.chuangmi_plug import ChuangmiPlug
 from miio.cooker import Cooker
 from miio.curtain_youpin import CurtainMiot
 from miio.gateway import Gateway
 from miio.heater import Heater
 from miio.heater_miot import HeaterMiot
 from miio.huizuo import Huizuo, HuizuoLampFan, HuizuoLampHeater, HuizuoLampScene
-from miio.integrations.fan.dmaker import Fan1C, FanMiot, FanP5, FanP9, FanP10, FanP11
+from miio.integrations.fan.dmaker import Fan1C, FanMiot, FanP5
 from miio.integrations.fan.leshow import FanLeshow
 from miio.integrations.fan.zhimi import Fan, FanZA5
 from miio.integrations.humidifier.deerma import AirHumidifierJsqs
@@ -55,12 +55,9 @@
     PhilipsWhiteBulb,
 )
 from miio.integrations.petwaterdispenser import PetWaterDispenser
-from miio.integrations.vacuum.dreame.dreamevacuum_miot import (
-    DreameVacuum,
-    DreameVacuumMiot,
-)
+from miio.integrations.vacuum.dreame.dreamevacuum_miot import DreameVacuum
 from miio.integrations.vacuum.mijia import G1Vacuum
-from miio.integrations.vacuum.roborock import RoborockVacuum, Vacuum, VacuumException
+from miio.integrations.vacuum.roborock import RoborockVacuum, VacuumException
 from miio.integrations.vacuum.roborock.vacuumcontainers import (
     CleaningDetails,
     CleaningSummary,

miio/airfresh.py

@@ -8,7 +8,6 @@
 from .click_common import EnumType, command, format_output
 from .device import Device, DeviceStatus
 from .exceptions import DeviceException
-from .utils import deprecated
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -348,22 +347,3 @@ def set_ptc(self, ptc: bool):
             return self.send("set_ptc_state", ["on"])
         else:
             return self.send("set_ptc_state", ["off"])
-
-
-@deprecated(
-    "This will be removed in the future, use AirFresh(..., model='zhimi.airfresh.va4'"
-)
-class AirFreshVA4(AirFresh):
-    """Main class representing the air fresh va4."""
-
-    def __init__(
-        self,
-        ip: str = None,
-        token: str = None,
-        start_id: int = 0,
-        debug: int = 0,
-        lazy_discover: bool = True,
-    ) -> None:
-        super().__init__(
-            ip, token, start_id, debug, lazy_discover, model=MODEL_AIRFRESH_VA4
-        )

miio/airhumidifier.py

@@ -8,7 +8,6 @@
 from .click_common import EnumType, command, format_output
 from .device import Device, DeviceInfo, DeviceStatus
 from .exceptions import DeviceError, DeviceException
-from .utils import deprecated
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -405,48 +404,3 @@ def set_dry(self, dry: bool):
             return self.send("set_dry", ["on"])
         else:
             return self.send("set_dry", ["off"])
-
-
-@deprecated("Use AirHumidifer(model='zhimi.humidifier.ca1")
-class AirHumidifierCA1(AirHumidifier):
-    def __init__(
-        self,
-        ip: str = None,
-        token: str = None,
-        start_id: int = 0,
-        debug: int = 0,
-        lazy_discover: bool = True,
-    ) -> None:
-        super().__init__(
-            ip, token, start_id, debug, lazy_discover, model=MODEL_HUMIDIFIER_CA1
-        )
-
-
-@deprecated("Use AirHumidifer(model='zhimi.humidifier.cb1")
-class AirHumidifierCB1(AirHumidifier):
-    def __init__(
-        self,
-        ip: str = None,
-        token: str = None,
-        start_id: int = 0,
-        debug: int = 0,
-        lazy_discover: bool = True,
-    ) -> None:
-        super().__init__(
-            ip, token, start_id, debug, lazy_discover, model=MODEL_HUMIDIFIER_CB1
-        )
-
-
-@deprecated("Use AirHumidifier(model='zhimi.humidifier.cb2')")
-class AirHumidifierCB2(AirHumidifier):
-    def __init__(
-        self,
-        ip: str = None,
-        token: str = None,
-        start_id: int = 0,
-        debug: int = 0,
-        lazy_discover: bool = True,
-    ) -> None:
-        super().__init__(
-            ip, token, start_id, debug, lazy_discover, model=MODEL_HUMIDIFIER_CB2
-        )

miio/airpurifier_airdog.py

@@ -8,7 +8,6 @@
 from .click_common import EnumType, command, format_output
 from .device import Device, DeviceStatus
 from .exceptions import DeviceException
-from .utils import deprecated
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -177,31 +176,3 @@ def set_child_lock(self, lock: bool):
     def set_filters_cleaned(self):
         """Set filters cleaned."""
         return self.send("set_clean")
-
-
-class AirDogX5(AirDogX3):
-    @deprecated("Use AirDogX3(model='airdog.airpurifier.x5')")
-    def __init__(
-        self,
-        ip: str = None,
-        token: str = None,
-        start_id: int = 0,
-        debug: int = 0,
-        lazy_discover: bool = True,
-        model: str = MODEL_AIRDOG_X5,
-    ) -> None:
-        super().__init__(ip, token, start_id, debug, lazy_discover, model=model)
-
-
-class AirDogX7SM(AirDogX3):
-    @deprecated("Use AirDogX3(model='airdog.airpurifier.x7sm')")
-    def __init__(
-        self,
-        ip: str = None,
-        token: str = None,
-        start_id: int = 0,
-        debug: int = 0,
-        lazy_discover: bool = True,
-        model: str = MODEL_AIRDOG_X7SM,
-    ) -> None:
-        super().__init__(ip, token, start_id, debug, lazy_discover, model=model)

miio/airpurifier_miot.py

@@ -4,8 +4,6 @@
 
 import click
 
-from miio.utils import deprecated
-
 from .airfilter_util import FilterType, FilterTypeUtil
 from .click_common import EnumType, command, format_output
 from .exceptions import DeviceException
@@ -545,9 +543,3 @@ def set_led_brightness_level(self, level: int):
             raise AirPurifierMiotException("Invalid brightness level: %s" % level)
 
         return self.set_property("led_brightness_level", level)
-
-
-class AirPurifierMB4(AirPurifierMiot):
-    @deprecated("Use AirPurifierMiot")
-    def __init__(*args, **kwargs):
-        super().__init__(*args, **kwargs)

miio/chuangmi_plug.py

@@ -173,59 +173,3 @@ def set_led(self, wifi_led: bool):
             return self.send("set_wifi_led", ["on"])
         else:
             return self.send("set_wifi_led", ["off"])
-
-
-@deprecated(
-    "This device class is deprecated. Please use the ChuangmiPlug "
-    "class in future and select a model by parameter 'model'."
-)
-class Plug(ChuangmiPlug):
-    def __init__(
-        self,
-        ip: str = None,
-        token: str = None,
-        start_id: int = 0,
-        debug: int = 0,
-        lazy_discover: bool = True,
-        *,
-        model: str = None
-    ) -> None:
-        super().__init__(
-            ip, token, start_id, debug, lazy_discover, model=MODEL_CHUANGMI_PLUG_M1
-        )
-
-
-@deprecated(
-    "This device class is deprecated. Please use the ChuangmiPlug "
-    "class in future and select a model by parameter 'model'."
-)
-class PlugV1(ChuangmiPlug):
-    def __init__(
-        self,
-        ip: str = None,
-        token: str = None,
-        start_id: int = 0,
-        debug: int = 0,
-        lazy_discover: bool = True,
-    ) -> None:
-        super().__init__(
-            ip, token, start_id, debug, lazy_discover, model=MODEL_CHUANGMI_PLUG_V1
-        )
-
-
-@deprecated(
-    "This device class is deprecated. Please use the ChuangmiPlug "
-    "class in future and select a model by parameter 'model'."
-)
-class PlugV3(ChuangmiPlug):
-    def __init__(
-        self,
-        ip: str = None,
-        token: str = None,
-        start_id: int = 0,
-        debug: int = 0,
-        lazy_discover: bool = True,
-    ) -> None:
-        super().__init__(
-            ip, token, start_id, debug, lazy_discover, model=MODEL_CHUANGMI_PLUG_V3
-        )

miio/discovery.py

@@ -15,8 +15,6 @@
     AirConditioningCompanion,
     AirConditioningCompanionMcn02,
     AirDogX3,
-    AirDogX5,
-    AirDogX7SM,
     AirFresh,
     AirFreshT2017,
     AirHumidifier,
@@ -43,8 +41,8 @@
     PhilipsRwread,
     PhilipsWhiteBulb,
     PowerStrip,
+    RoborockVacuum,
     Toiletlid,
-    Vacuum,
     ViomiVacuum,
     WaterPurifier,
     WaterPurifierYunmi,
@@ -89,10 +87,10 @@
 
 
 DEVICE_MAP: Dict[str, Union[Type[Device], partial]] = {
-    "rockrobo-vacuum-v1": Vacuum,
-    "roborock-vacuum-s5": Vacuum,
-    "roborock-vacuum-m1s": Vacuum,
-    "roborock-vacuum-a10": Vacuum,
+    "rockrobo-vacuum-v1": RoborockVacuum,
+    "roborock-vacuum-s5": RoborockVacuum,
+    "roborock-vacuum-m1s": RoborockVacuum,
+    "roborock-vacuum-a10": RoborockVacuum,
     "chuangmi-plug-m1": partial(ChuangmiPlug, model=MODEL_CHUANGMI_PLUG_M1),
     "chuangmi-plug-m3": partial(ChuangmiPlug, model=MODEL_CHUANGMI_PLUG_M3),
     "chuangmi-plug-v1": partial(ChuangmiPlug, model=MODEL_CHUANGMI_PLUG_V1),
@@ -109,8 +107,8 @@
     "xiaomi.aircondition.mc4": AirConditionerMiot,
     "xiaomi.aircondition.mc5": AirConditionerMiot,
     "airdog-airpurifier-x3": AirDogX3,
-    "airdog-airpurifier-x5": AirDogX5,
-    "airdog-airpurifier-x7sm": AirDogX7SM,
+    "airdog-airpurifier-x5": AirDogX3,
+    "airdog-airpurifier-x7sm": AirDogX3,
     "zhimi-airpurifier-m1": AirPurifier,  # mini model
     "zhimi-airpurifier-m2": AirPurifier,  # mini model 2
     "zhimi-airpurifier-ma1": AirPurifier,  # ms model

miio/integrations/fan/dmaker/__init__.py

@@ -1,3 +1,3 @@
 # flake8: noqa
 from .fan import FanP5
-from .fan_miot import Fan1C, FanMiot, FanP9, FanP10, FanP11
+from .fan_miot import Fan1C, FanMiot

miio/integrations/fan/dmaker/fan_miot.py

@@ -6,7 +6,6 @@
 from miio import DeviceStatus, MiotDevice
 from miio.click_common import EnumType, command, format_output
 from miio.fan_common import FanException, MoveDirection, OperationMode
-from miio.utils import deprecated
 
 MODEL_FAN_P9 = "dmaker.fan.p9"
 MODEL_FAN_P10 = "dmaker.fan.p10"
@@ -371,21 +370,6 @@ def set_rotate(self, direction: MoveDirection):
         return self.set_property("set_move", value)
 
 
-@deprecated("Use FanMiot")
-class FanP9(FanMiot):
-    mapping = MIOT_MAPPING[MODEL_FAN_P9]
-
-
-@deprecated("Use FanMiot")
-class FanP10(FanMiot):
-    mapping = MIOT_MAPPING[MODEL_FAN_P10]
-
-
-@deprecated("Use FanMiot")
-class FanP11(FanMiot):
-    mapping = MIOT_MAPPING[MODEL_FAN_P11]
-
-
 class Fan1C(MiotDevice):
     mapping = MIOT_MAPPING[MODEL_FAN_1C]
 

miio/integrations/vacuum/dreame/dreamevacuum_miot.py

@@ -10,7 +10,6 @@
 from miio.exceptions import DeviceException
 from miio.miot_device import DeviceStatus as DeviceStatusContainer
 from miio.miot_device import MiotDevice, MiotMapping
-from miio.utils import deprecated
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -610,9 +609,3 @@ def rotate(self, rotatation: int) -> None:
                 },
             ],
         )
-
-
-class DreameVacuumMiot(DreameVacuum):
-    @deprecated("DreameVacuumMiot is deprectaed. Use DreameVacuum instead.")
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)