Move philips light implementations to integrations/light/philips

miio/__init__.py

@@ -33,7 +33,6 @@
 from miio.airqualitymonitor import AirQualityMonitor
 from miio.airqualitymonitor_miot import AirQualityMonitorCGDN1
 from miio.aqaracamera import AqaraCamera
-from miio.ceil import Ceil
 from miio.chuangmi_camera import ChuangmiCamera
 from miio.chuangmi_ir import ChuangmiIr
 from miio.chuangmi_plug import ChuangmiPlug, Plug, PlugV1, PlugV3
@@ -46,6 +45,14 @@
 from miio.huizuo import Huizuo, HuizuoLampFan, HuizuoLampHeater, HuizuoLampScene
 from miio.integrations.fan.dmaker import Fan1C, FanMiot, FanP5, FanP9, FanP10, FanP11
 from miio.integrations.fan.zhimi import Fan, FanZA5
+from miio.integrations.light.philips import (
+    Ceil,
+    PhilipsBulb,
+    PhilipsEyecare,
+    PhilipsMoonlight,
+    PhilipsRwread,
+    PhilipsWhiteBulb,
+)
 from miio.integrations.petwaterdispenser import PetWaterDispenser
 from miio.integrations.vacuum.dreame.dreamevacuum_miot import DreameVacuumMiot
 from miio.integrations.vacuum.mijia import G1Vacuum
@@ -61,10 +68,6 @@
 from miio.integrations.vacuum.roidmi.roidmivacuum_miot import RoidmiVacuumMiot
 from miio.integrations.vacuum.viomi.viomivacuum import ViomiVacuum
 from miio.integrations.yeelight import Yeelight
-from miio.philips_bulb import PhilipsBulb, PhilipsWhiteBulb
-from miio.philips_eyecare import PhilipsEyecare
-from miio.philips_moonlight import PhilipsMoonlight
-from miio.philips_rwread import PhilipsRwread
 from miio.powerstrip import PowerStrip
 from miio.protocol import Message, Utils
 from miio.pwzn_relay import PwznRelay

miio/integrations/light/philips/__init__.py

@@ -0,0 +1,6 @@
+# flake8: noqa
+from .ceil import Ceil
+from .philips_bulb import PhilipsBulb, PhilipsWhiteBulb
+from .philips_eyecare import PhilipsEyecare
+from .philips_moonlight import PhilipsMoonlight
+from .philips_rwread import PhilipsRwread

miio/ceil.py → miio/integrations/light/philips/ceil.py

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

miio/philips_bulb.py → miio/integrations/light/philips/philips_bulb.py

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

miio/philips_eyecare.py → miio/integrations/light/philips/philips_eyecare.py

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

miio/philips_moonlight.py → miio/integrations/light/philips/philips_moonlight.py

@@ -4,10 +4,9 @@
 
 import click
 
-from .click_common import command, format_output
-from .device import Device, DeviceStatus
-from .exceptions import DeviceException
-from .utils import int_to_rgb
+from miio import Device, DeviceException, DeviceStatus
+from miio.click_common import command, format_output
+from miio.utils import int_to_rgb
 
 _LOGGER = logging.getLogger(__name__)
 

miio/philips_rwread.py → miio/integrations/light/philips/philips_rwread.py

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

miio/tests/test_ceil.py → miio/integrations/light/philips/tests/test_ceil.py

@@ -2,10 +2,9 @@
 
 import pytest
 
-from miio import Ceil
-from miio.ceil import CeilException, CeilStatus
+from miio.tests.dummies import DummyDevice
 
-from .dummies import DummyDevice
+from ..ceil import Ceil, CeilException, CeilStatus
 
 
 class DummyCeil(DummyDevice, Ceil):

miio/tests/test_philips_bulb.py → miio/integrations/light/philips/tests/test_philips_bulb.py

@@ -2,16 +2,17 @@
 
 import pytest
 
-from miio import PhilipsBulb, PhilipsWhiteBulb
-from miio.philips_bulb import (
+from miio.tests.dummies import DummyDevice
+
+from ..philips_bulb import (
     MODEL_PHILIPS_LIGHT_BULB,
     MODEL_PHILIPS_LIGHT_HBULB,
+    PhilipsBulb,
     PhilipsBulbException,
     PhilipsBulbStatus,
+    PhilipsWhiteBulb,
 )
 
-from .dummies import DummyDevice
-
 
 class DummyPhilipsBulb(DummyDevice, PhilipsBulb):
     def __init__(self, *args, **kwargs):

miio/tests/test_philips_eyecare.py → miio/integrations/light/philips/tests/test_philips_eyecare.py

@@ -2,10 +2,13 @@
 
 import pytest
 
-from miio import PhilipsEyecare
-from miio.philips_eyecare import PhilipsEyecareException, PhilipsEyecareStatus
+from miio.tests.dummies import DummyDevice
 
-from .dummies import DummyDevice
+from ..philips_eyecare import (
+    PhilipsEyecare,
+    PhilipsEyecareException,
+    PhilipsEyecareStatus,
+)
 
 
 class DummyPhilipsEyecare(DummyDevice, PhilipsEyecare):

miio/tests/test_philips_moonlight.py → miio/integrations/light/philips/tests/test_philips_moonlight.py

@@ -2,11 +2,14 @@
 
 import pytest
 
-from miio import PhilipsMoonlight
-from miio.philips_moonlight import PhilipsMoonlightException, PhilipsMoonlightStatus
+from miio.tests.dummies import DummyDevice
 from miio.utils import int_to_rgb, rgb_to_int
 
-from .dummies import DummyDevice
+from ..philips_moonlight import (
+    PhilipsMoonlight,
+    PhilipsMoonlightException,
+    PhilipsMoonlightStatus,
+)
 
 
 class DummyPhilipsMoonlight(DummyDevice, PhilipsMoonlight):

miio/tests/test_philips_rwread.py → miio/integrations/light/philips/tests/test_philips_rwread.py

@@ -2,16 +2,16 @@
 
 import pytest
 
-from miio import PhilipsRwread
-from miio.philips_rwread import (
+from miio.tests.dummies import DummyDevice
+
+from ..philips_rwread import (
     MODEL_PHILIPS_LIGHT_RWREAD,
     MotionDetectionSensitivity,
+    PhilipsRwread,
     PhilipsRwreadException,
     PhilipsRwreadStatus,
 )
 
-from .dummies import DummyDevice
-
 
 class DummyPhilipsRwread(DummyDevice, PhilipsRwread):
     def __init__(self, *args, **kwargs):