Minor Tuya Fix (#35497)

homeassistant/components/tuya/__init__.py

@@ -207,7 +207,7 @@ class TuyaDevice(Entity):
     def __init__(self, tuya, platform):
         """Init Tuya devices."""
         self._tuya = tuya
-        self._platform = platform
+        self._tuya_platform = platform
 
     async def async_added_to_hass(self):
         """Call when entity is added to hass."""
@@ -241,7 +241,9 @@ class TuyaDevice(Entity):
         """Return a device description for device registry."""
         _device_info = {
             "identifiers": {(DOMAIN, f"{self.unique_id}")},
-            "manufacturer": TUYA_PLATFORMS.get(self._platform, self._platform),
+            "manufacturer": TUYA_PLATFORMS.get(
+                self._tuya_platform, self._tuya_platform
+            ),
             "name": self.name,
             "model": self._tuya.object_type(),
         }
@@ -251,7 +253,6 @@ class TuyaDevice(Entity):
         """Refresh Tuya device data."""
         self._tuya.update()
 
-    @callback
     async def _delete_callback(self, dev_id):
         """Remove this entity."""
         if dev_id == self.object_id:

homeassistant/components/tuya/climate.py

@@ -71,10 +71,10 @@ def _setup_entities(hass, dev_ids, platform):
     tuya = hass.data[DOMAIN][TUYA_DATA]
     entities = []
     for dev_id in dev_ids:
-        entity = tuya.get_device_by_id(dev_id)
+        device = tuya.get_device_by_id(dev_id)
-        if entity is None:
+        if device is None:
             continue
-        entities.append(TuyaClimateEntity(entity, platform))
+        entities.append(TuyaClimateEntity(device, platform))
     return entities
 
 

homeassistant/components/tuya/cover.py

@@ -43,10 +43,10 @@ def _setup_entities(hass, dev_ids, platform):
     tuya = hass.data[DOMAIN][TUYA_DATA]
     entities = []
     for dev_id in dev_ids:
-        entity = tuya.get_device_by_id(dev_id)
+        device = tuya.get_device_by_id(dev_id)
-        if entity is None:
+        if device is None:
             continue
-        entities.append(TuyaCover(entity, platform))
+        entities.append(TuyaCover(device, platform))
     return entities
 
 

homeassistant/components/tuya/fan.py

@@ -42,10 +42,10 @@ def _setup_entities(hass, dev_ids, platform):
     tuya = hass.data[DOMAIN][TUYA_DATA]
     entities = []
     for dev_id in dev_ids:
-        entity = tuya.get_device_by_id(dev_id)
+        device = tuya.get_device_by_id(dev_id)
-        if entity is None:
+        if device is None:
             continue
-        entities.append(TuyaFanDevice(entity, platform))
+        entities.append(TuyaFanDevice(device, platform))
     return entities
 
 

homeassistant/components/tuya/light.py

@@ -47,10 +47,10 @@ def _setup_entities(hass, dev_ids, platform):
     tuya = hass.data[DOMAIN][TUYA_DATA]
     entities = []
     for dev_id in dev_ids:
-        entity = tuya.get_device_by_id(dev_id)
+        device = tuya.get_device_by_id(dev_id)
-        if entity is None:
+        if device is None:
             continue
-        entities.append(TuyaLight(entity, platform))
+        entities.append(TuyaLight(device, platform))
     return entities
 
 

homeassistant/components/tuya/scene.py

@@ -40,10 +40,10 @@ def _setup_entities(hass, dev_ids, platform):
     tuya = hass.data[DOMAIN][TUYA_DATA]
     entities = []
     for dev_id in dev_ids:
-        entity = tuya.get_device_by_id(dev_id)
+        device = tuya.get_device_by_id(dev_id)
-        if entity is None:
+        if device is None:
             continue
-        entities.append(TuyaScene(entity, platform))
+        entities.append(TuyaScene(device, platform))
     return entities
 
 

homeassistant/components/tuya/strings.json

@@ -14,7 +14,6 @@
       }
     },
     "abort": {
-      "already_in_progress": "Tuya configuration is already in progress.",
       "auth_failed": "[%key:common::config_flow::error::invalid_auth%]",
       "conn_error": "[%key:common::config_flow::error::cannot_connect%]",
       "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"

homeassistant/components/tuya/switch.py

@@ -40,10 +40,10 @@ def _setup_entities(hass, dev_ids, platform):
     tuya = hass.data[DOMAIN][TUYA_DATA]
     entities = []
     for dev_id in dev_ids:
-        entity = tuya.get_device_by_id(dev_id)
+        device = tuya.get_device_by_id(dev_id)
-        if entity is None:
+        if device is None:
             continue
-        entities.append(TuyaSwitch(entity, platform))
+        entities.append(TuyaSwitch(device, platform))
     return entities
 
 

homeassistant/components/tuya/translations/en.json

@@ -1,7 +1,6 @@
 {
     "config": {
         "abort": {
-            "already_in_progress": "Tuya configuration is already in progress.",
             "auth_failed": "Configured Tuya credential are incorrect.",
             "conn_error": "Connection to Tuya failed.",
             "single_instance_allowed": "Only a single configuration of Tuya is allowed."