Fix for HA 2022.12.8 #8

Use mqtt.valid_qos_schema instead of _VALID_QOS_SCHEMA
elbowz · Jan 2, 2023 · 757a570 · 757a570
1 parent e004308
commit 757a570
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/homie/__init__.py b/homie/__init__.py
@@ -31,7 +31,6 @@
     CONF_QOS,
     CONF_INCLUDE,
     CONF_EXCLUDE,
-    _VALID_QOS_SCHEMA,
     DEFAULT_BASE_TOPIC,
     DEFAULT_QOS,
     DEFAULT_DISCOVERY,
@@ -47,7 +46,7 @@
                 vol.Optional(
                     CONF_BASE_TOPIC, default=DEFAULT_BASE_TOPIC
                 ): mqtt.valid_subscribe_topic,
-                vol.Optional(CONF_QOS, default=DEFAULT_QOS): _VALID_QOS_SCHEMA,
+                vol.Optional(CONF_QOS, default=DEFAULT_QOS): mqtt.valid_qos_schema,
                 vol.Optional(CONF_DISCOVERY, default=DEFAULT_DISCOVERY): cv.boolean,
                 vol.Optional(CONF_INCLUDE, default=[]): vol.All(
                     cv.ensure_list, [cv.string]

diff --git a/homie/config_flow.py b/homie/config_flow.py
@@ -24,7 +24,6 @@
     DEFAULT_QOS,
     CONF_DISCOVERY,
     DEFAULT_DISCOVERY,
-    _VALID_QOS_SCHEMA,
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -34,7 +33,7 @@
 CONFIG_SCHEMA = vol.Schema(
     {
         vol.Optional(CONF_BASE_TOPIC, default=DEFAULT_BASE_TOPIC): cv.string,
-        vol.Optional(CONF_QOS, default=DEFAULT_QOS): _VALID_QOS_SCHEMA,
+        vol.Optional(CONF_QOS, default=DEFAULT_QOS): mqtt.valid_qos_schema,
         vol.Optional(CONF_DISCOVERY, default=DEFAULT_DISCOVERY): cv.boolean,
     }
 )
@@ -133,7 +132,7 @@ async def async_step_init(
         MOD_CONFIG_SCHEMA = vol.Schema(
             {
                 vol.Optional(CONF_BASE_TOPIC, default=base_topic): cv.string,
-                vol.Optional(CONF_QOS, default=qos): _VALID_QOS_SCHEMA,
+                vol.Optional(CONF_QOS, default=qos): mqtt.valid_qos_schema,
                 vol.Optional(
                     CONF_DISCOVERY,
                     default=discovery,

diff --git a/homie/const.py b/homie/const.py
@@ -8,7 +8,7 @@
     CONF_UNIQUE_ID,
     CONF_DEVICE_CLASS,
 )
-from homeassistant.components.mqtt import CONF_DISCOVERY, CONF_QOS, _VALID_QOS_SCHEMA
+from homeassistant.components.mqtt import CONF_DISCOVERY, CONF_QOS
 from .homie import TRUE, FALSE
 
 DOMAIN = "homie"

diff --git a/homie/entity_base.py b/homie/entity_base.py
@@ -7,7 +7,7 @@
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.typing import ConfigType
 
-from homeassistant.components.mqtt import valid_subscribe_topic
+from homeassistant.components.mqtt import valid_subscribe_topic, valid_qos_schema
 
 from .homie import HomieDevice, HomieProperty
 
@@ -16,7 +16,6 @@
     CONF_QOS,
     DEFAULT_QOS,
     DATA_KNOWN_DEVICES,
-    _VALID_QOS_SCHEMA,
     CONF_NAME,
     CONF_ICON,
     CONF_UNIQUE_ID,
@@ -37,7 +36,7 @@
         vol.Optional(CONF_ICON): cv.icon,
         vol.Optional(CONF_UNIQUE_ID): cv.string,
         vol.Optional(CONF_ENABLED_BY_DEFAULT, default=True): cv.boolean,
-        vol.Optional(CONF_QOS, default=DEFAULT_QOS): _VALID_QOS_SCHEMA,
+        vol.Optional(CONF_QOS, default=DEFAULT_QOS): valid_qos_schema,
         vol.Exclusive(CONF_PROPERTY, "property"): vol.Schema(
             {
                 vol.Required(CONF_DEVICE): cv.string,