Rename device classes to entity classes (HA 0.110 deprecation) (#35)

custom_components/goldair_climate/dehumidifier/climate.py

@@ -1,7 +1,11 @@
 """
 Goldair WiFi Dehumidifier device.
 """
-from homeassistant.components.climate import ClimateDevice
+try:
+    from homeassistant.components.climate import ClimateEntity
+except ImportError:
+    from homeassistant.components.climate import ClimateDevice as ClimateEntity
+
 from homeassistant.components.climate.const import (
     ATTR_FAN_MODE,
     ATTR_HUMIDITY,
@@ -38,7 +42,7 @@ from .const import (
 SUPPORT_FLAGS = SUPPORT_TARGET_HUMIDITY | SUPPORT_PRESET_MODE | SUPPORT_FAN_MODE
 
 
-class GoldairDehumidifier(ClimateDevice):
+class GoldairDehumidifier(ClimateEntity):
     """Representation of a Goldair WiFi dehumidifier."""
 
     def __init__(self, device):

custom_components/goldair_climate/dehumidifier/light.py

@@ -1,15 +1,19 @@
 """
 Platform to control the LED display light on Goldair WiFi-connected dehumidifiers.
 """
+try:
+    from homeassistant.components.light import LightEntity
+except ImportError:
+    from homeassistant.components.light import Light as LightEntity
+
 from homeassistant.components.climate import ATTR_HVAC_MODE, HVAC_MODE_OFF
-from homeassistant.components.light import Light
 from homeassistant.const import STATE_UNAVAILABLE
 
 from ..device import GoldairTuyaDevice
 from .const import ATTR_DISPLAY_ON, HVAC_MODE_TO_DPS_MODE, PROPERTY_TO_DPS_ID
 
 
-class GoldairDehumidifierLedDisplayLight(Light):
+class GoldairDehumidifierLedDisplayLight(LightEntity):
     """Representation of a Goldair WiFi-connected dehumidifier LED display."""
 
     def __init__(self, device):

custom_components/goldair_climate/dehumidifier/lock.py

@@ -1,14 +1,19 @@
 """
 Platform to control the child lock on Goldair WiFi-connected dehumidifiers.
 """
-from homeassistant.components.lock import STATE_LOCKED, STATE_UNLOCKED, LockDevice
+try:
+    from homeassistant.components.lock import LockEntity
+except ImportError:
+    from homeassistant.components.lock import LockDevice as LockEntity
+
+from homeassistant.components.lock import STATE_LOCKED, STATE_UNLOCKED
 from homeassistant.const import STATE_UNAVAILABLE
 
 from ..device import GoldairTuyaDevice
 from .const import ATTR_CHILD_LOCK, PROPERTY_TO_DPS_ID
 
 
-class GoldairDehumidifierChildLock(LockDevice):
+class GoldairDehumidifierChildLock(LockEntity):
     """Representation of a Goldair WiFi-connected dehumidifier child lock."""
 
     def __init__(self, device):

custom_components/goldair_climate/fan/climate.py

@@ -1,7 +1,11 @@
 """
 Goldair WiFi Fan device.
 """
-from homeassistant.components.climate import ClimateDevice
+try:
+    from homeassistant.components.climate import ClimateEntity
+except ImportError:
+    from homeassistant.components.climate import ClimateDevice as ClimateEntity
+
 from homeassistant.components.climate.const import (
     ATTR_FAN_MODE,
     ATTR_HVAC_MODE,
@@ -25,7 +29,7 @@ from .const import (
 SUPPORT_FLAGS = SUPPORT_FAN_MODE | SUPPORT_PRESET_MODE | SUPPORT_SWING_MODE
 
 
-class GoldairFan(ClimateDevice):
+class GoldairFan(ClimateEntity):
     """Representation of a Goldair WiFi fan."""
 
     def __init__(self, device):

custom_components/goldair_climate/fan/light.py

@@ -1,15 +1,19 @@
 """
 Platform to control the LED display light on Goldair WiFi-connected fans and panels.
 """
+try:
+    from homeassistant.components.light import LightEntity
+except ImportError:
+    from homeassistant.components.light import Light as LightEntity
+
 from homeassistant.components.climate import ATTR_HVAC_MODE, HVAC_MODE_OFF
-from homeassistant.components.light import Light
 from homeassistant.const import STATE_UNAVAILABLE
 
 from ..device import GoldairTuyaDevice
 from .const import ATTR_DISPLAY_ON, HVAC_MODE_TO_DPS_MODE, PROPERTY_TO_DPS_ID
 
 
-class GoldairFanLedDisplayLight(Light):
+class GoldairFanLedDisplayLight(LightEntity):
     """Representation of a Goldair WiFi-connected fan LED display."""
 
     def __init__(self, device):

custom_components/goldair_climate/geco_heater/climate.py

@@ -1,7 +1,11 @@
 """
 Goldair GECO WiFi Heater device.
 """
-from homeassistant.components.climate import ClimateDevice
+try:
+    from homeassistant.components.climate import ClimateEntity
+except ImportError:
+    from homeassistant.components.climate import ClimateDevice as ClimateEntity
+
 from homeassistant.components.climate.const import (
     ATTR_HVAC_MODE,
     HVAC_MODE_HEAT,
@@ -20,7 +24,7 @@ from .const import (
 SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE
 
 
-class GoldairGECOHeater(ClimateDevice):
+class GoldairGECOHeater(ClimateEntity):
     """Representation of a Goldair GECO WiFi heater."""
 
     def __init__(self, device):

custom_components/goldair_climate/geco_heater/lock.py

@@ -1,14 +1,19 @@
 """
 Platform to control the child lock on Goldair GECO WiFi-connected heaters and panels.
 """
-from homeassistant.components.lock import STATE_LOCKED, STATE_UNLOCKED, LockDevice
+try:
+    from homeassistant.components.lock import LockEntity
+except ImportError:
+    from homeassistant.components.lock import LockDevice as LockEntity
+
+from homeassistant.components.lock import STATE_LOCKED, STATE_UNLOCKED
 from homeassistant.const import STATE_UNAVAILABLE
 
 from ..device import GoldairTuyaDevice
 from .const import ATTR_CHILD_LOCK, PROPERTY_TO_DPS_ID
 
 
-class GoldairGECOHeaterChildLock(LockDevice):
+class GoldairGECOHeaterChildLock(LockEntity):
     """Representation of a Goldair GECO WiFi-connected heater child lock."""
 
     def __init__(self, device):

custom_components/goldair_climate/gpcv_heater/climate.py

@@ -1,7 +1,11 @@
 """
 Goldair GPCV WiFi Heater device.
 """
-from homeassistant.components.climate import ClimateDevice
+try:
+    from homeassistant.components.climate import ClimateEntity
+except ImportError:
+    from homeassistant.components.climate import ClimateDevice as ClimateEntity
+
 from homeassistant.components.climate.const import (
     ATTR_HVAC_MODE,
     ATTR_PRESET_MODE,
@@ -23,7 +27,7 @@ from .const import (
 SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE | SUPPORT_PRESET_MODE
 
 
-class GoldairGPCVHeater(ClimateDevice):
+class GoldairGPCVHeater(ClimateEntity):
     """Representation of a Goldair GPCV WiFi heater."""
 
     def __init__(self, device):

custom_components/goldair_climate/gpcv_heater/lock.py

@@ -1,14 +1,19 @@
 """
 Platform to control the child lock on Goldair GPCV WiFi-connected heaters and panels.
 """
-from homeassistant.components.lock import STATE_LOCKED, STATE_UNLOCKED, LockDevice
+try:
+    from homeassistant.components.lock import LockEntity
+except ImportError:
+    from homeassistant.components.lock import LockDevice as LockEntity
+
+from homeassistant.components.lock import STATE_LOCKED, STATE_UNLOCKED
 from homeassistant.const import STATE_UNAVAILABLE
 
 from ..device import GoldairTuyaDevice
 from .const import ATTR_CHILD_LOCK, PROPERTY_TO_DPS_ID
 
 
-class GoldairGPCVHeaterChildLock(LockDevice):
+class GoldairGPCVHeaterChildLock(LockEntity):
     """Representation of a Goldair GPCV WiFi-connected heater child lock."""
 
     def __init__(self, device):

custom_components/goldair_climate/heater/climate.py

@@ -1,7 +1,11 @@
 """
 Goldair WiFi Heater device.
 """
-from homeassistant.components.climate import ClimateDevice
+try:
+    from homeassistant.components.climate import ClimateEntity
+except ImportError:
+    from homeassistant.components.climate import ClimateDevice as ClimateEntity
+
 from homeassistant.components.climate.const import (
     ATTR_HVAC_MODE,
     ATTR_PRESET_MODE,
@@ -33,7 +37,7 @@ from .const import (
 SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE | SUPPORT_PRESET_MODE | SUPPORT_SWING_MODE
 
 
-class GoldairHeater(ClimateDevice):
+class GoldairHeater(ClimateEntity):
     """Representation of a Goldair WiFi heater."""
 
     def __init__(self, device):

custom_components/goldair_climate/heater/light.py

@@ -1,15 +1,19 @@
 """
 Platform to control the LED display light on Goldair WiFi-connected heaters and panels.
 """
+try:
+    from homeassistant.components.light import LightEntity
+except ImportError:
+    from homeassistant.components.light import Light as LightEntity
+
 from homeassistant.components.climate import ATTR_HVAC_MODE, HVAC_MODE_OFF
-from homeassistant.components.light import Light
 from homeassistant.const import STATE_UNAVAILABLE
 
 from ..device import GoldairTuyaDevice
 from .const import ATTR_DISPLAY_ON, HVAC_MODE_TO_DPS_MODE, PROPERTY_TO_DPS_ID
 
 
-class GoldairHeaterLedDisplayLight(Light):
+class GoldairHeaterLedDisplayLight(LightEntity):
     """Representation of a Goldair WiFi-connected heater LED display."""
 
     def __init__(self, device):

custom_components/goldair_climate/heater/lock.py

@@ -1,14 +1,19 @@
 """
 Platform to control the child lock on Goldair WiFi-connected heaters and panels.
 """
-from homeassistant.components.lock import STATE_LOCKED, STATE_UNLOCKED, LockDevice
+try:
+    from homeassistant.components.lock import LockEntity
+except ImportError:
+    from homeassistant.components.lock import LockDevice as LockEntity
+
+from homeassistant.components.lock import STATE_LOCKED, STATE_UNLOCKED
 from homeassistant.const import STATE_UNAVAILABLE
 
 from ..device import GoldairTuyaDevice
 from .const import ATTR_CHILD_LOCK, PROPERTY_TO_DPS_ID
 
 
-class GoldairHeaterChildLock(LockDevice):
+class GoldairHeaterChildLock(LockEntity):
     """Representation of a Goldair WiFi-connected heater child lock."""
 
     def __init__(self, device):