diff --git a/homeassistant/components/mqtt_room/sensor.py b/homeassistant/components/mqtt_room/sensor.py index 0d07133b396..3b61003e601 100644 --- a/homeassistant/components/mqtt_room/sensor.py +++ b/homeassistant/components/mqtt_room/sensor.py @@ -8,7 +8,14 @@ import voluptuous as vol from homeassistant.components import mqtt from homeassistant.components.mqtt import CONF_STATE_TOPIC from homeassistant.components.sensor import PLATFORM_SCHEMA -from homeassistant.const import ATTR_ID, CONF_NAME, CONF_TIMEOUT, STATE_NOT_HOME +from homeassistant.const import ( + ATTR_DEVICE_ID, + ATTR_ID, + CONF_DEVICE_ID, + CONF_NAME, + CONF_TIMEOUT, + STATE_NOT_HOME, +) from homeassistant.core import callback import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity @@ -16,11 +23,9 @@ from homeassistant.util import dt, slugify _LOGGER = logging.getLogger(__name__) -ATTR_DEVICE_ID = "device_id" ATTR_DISTANCE = "distance" ATTR_ROOM = "room" -CONF_DEVICE_ID = "device_id" CONF_AWAY_TIMEOUT = "away_timeout" DEFAULT_AWAY_TIMEOUT = 0 diff --git a/tests/components/mqtt_room/test_sensor.py b/tests/components/mqtt_room/test_sensor.py index ca5f9420dc5..c3b8704c754 100644 --- a/tests/components/mqtt_room/test_sensor.py +++ b/tests/components/mqtt_room/test_sensor.py @@ -5,7 +5,7 @@ from unittest.mock import patch from homeassistant.components.mqtt import CONF_QOS, CONF_STATE_TOPIC, DEFAULT_QOS import homeassistant.components.sensor as sensor -from homeassistant.const import CONF_NAME, CONF_PLATFORM +from homeassistant.const import CONF_DEVICE_ID, CONF_NAME, CONF_PLATFORM, CONF_TIMEOUT from homeassistant.setup import async_setup_component from homeassistant.util import dt @@ -21,9 +21,6 @@ LIVING_ROOM_TOPIC = f"room_presence/{LIVING_ROOM}" SENSOR_STATE = f"sensor.{NAME}" -CONF_DEVICE_ID = "device_id" -CONF_TIMEOUT = "timeout" - NEAR_MESSAGE = {"id": DEVICE_ID, "name": NAME, "distance": 1} FAR_MESSAGE = {"id": DEVICE_ID, "name": NAME, "distance": 10}