Refactoring: Split Device class into Device+Protocol

miio/__init__.py

@@ -16,7 +16,8 @@
 from miio.chuangmi_ir import ChuangmiIr
 from miio.chuangmi_plug import ChuangmiPlug, Plug, PlugV1, PlugV3
 from miio.cooker import Cooker
-from miio.device import Device, DeviceError, DeviceException
+from miio.device import Device
+from miio.exceptions import DeviceError, DeviceException
 from miio.fan import Fan, FanP5, FanSA1, FanV2, FanZA1, FanZA4
 from miio.philips_bulb import PhilipsBulb, PhilipsWhiteBulb
 from miio.philips_eyecare import PhilipsEyecare

miio/airconditioningcompanion.py

@@ -5,7 +5,8 @@
 import click
 
 from .click_common import EnumType, command, format_output
-from .device import Device, DeviceException
+from .device import Device
+from .exceptions import DeviceException
 
 _LOGGER = logging.getLogger(__name__)
 

miio/airdehumidifier.py

@@ -6,7 +6,8 @@
 import click
 
 from .click_common import EnumType, command, format_output
-from .device import Device, DeviceError, DeviceException, DeviceInfo
+from .device import Device, DeviceInfo
+from .exceptions import DeviceError, DeviceException
 
 _LOGGER = logging.getLogger(__name__)
 

miio/airfresh.py

@@ -6,7 +6,8 @@
 import click
 
 from .click_common import EnumType, command, format_output
-from .device import Device, DeviceException
+from .device import Device
+from .exceptions import DeviceException
 
 _LOGGER = logging.getLogger(__name__)
 

miio/airfresh_t2017.py

@@ -6,7 +6,8 @@
 import click
 
 from .click_common import EnumType, command, format_output
-from .device import Device, DeviceException
+from .device import Device
+from .exceptions import DeviceException
 
 _LOGGER = logging.getLogger(__name__)
 

miio/airhumidifier.py

@@ -6,7 +6,8 @@
 import click
 
 from .click_common import EnumType, command, format_output
-from .device import Device, DeviceError, DeviceException, DeviceInfo
+from .device import Device, DeviceInfo
+from .exceptions import DeviceError, DeviceException
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -119,7 +120,7 @@ def child_lock(self) -> bool:
 
     @property
     def target_humidity(self) -> int:
-        """Target humiditiy. Can be either 30, 40, 50, 60, 70, 80 percent."""
+        """Target humidity. Can be either 30, 40, 50, 60, 70, 80 percent."""
         return self.data["limit_hum"]
 
     @property

miio/airhumidifier_mjjsq.py

@@ -6,7 +6,8 @@
 import click
 
 from .click_common import EnumType, command, format_output
-from .device import Device, DeviceException
+from .device import Device
+from .exceptions import DeviceException
 
 _LOGGER = logging.getLogger(__name__)
 

miio/airpurifier.py

@@ -7,7 +7,8 @@
 import click
 
 from .click_common import EnumType, command, format_output
-from .device import Device, DeviceException
+from .device import Device
+from .exceptions import DeviceException
 
 _LOGGER = logging.getLogger(__name__)
 

miio/airqualitymonitor.py

@@ -5,7 +5,8 @@
 import click
 
 from .click_common import command, format_output
-from .device import Device, DeviceException
+from .device import Device
+from .exceptions import DeviceException
 
 _LOGGER = logging.getLogger(__name__)
 

miio/aqaracamera.py

@@ -15,7 +15,8 @@
 import click
 
 from .click_common import command, format_output
-from .device import Device, DeviceException
+from .device import Device
+from .exceptions import DeviceException
 
 _LOGGER = logging.getLogger(__name__)
 

miio/ceil.py

@@ -5,7 +5,8 @@
 import click
 
 from .click_common import command, format_output
-from .device import Device, DeviceException
+from .device import Device
+from .exceptions import DeviceException
 
 _LOGGER = logging.getLogger(__name__)
 

miio/ceil_cli.py

@@ -5,6 +5,7 @@
 
 import miio  # noqa: E402
 from miio.click_common import ExceptionHandlerGroup, validate_ip, validate_token
+from miio.protocol import Protocol
 
 _LOGGER = logging.getLogger(__name__)
 pass_dev = click.make_pass_decorator(miio.Ceil)
@@ -65,7 +66,7 @@ def cli(ctx, ip: str, token: str, debug: int):
 @cli.command()
 def discover():
     """Search for plugs in the network."""
-    miio.Ceil.discover()
+    Protocol.discover()
 
 
 @cli.command()

miio/chuangmi_ir.py

@@ -19,7 +19,8 @@
 )
 
 from .click_common import command, format_output
-from .device import Device, DeviceException
+from .device import Device
+from .exceptions import DeviceException
 
 
 class ChuangmiIrException(DeviceException):

miio/cooker.py

@@ -8,7 +8,8 @@
 import click
 
 from .click_common import command, format_output
-from .device import Device, DeviceException
+from .device import Device
+from .exceptions import DeviceException
 
 _LOGGER = logging.getLogger(__name__)