evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use global CONF_UNIQUE_ID for mqtt (#38595)

Browse source 
* Use global CONF_UNIQUE_ID for mqtt

* Update __init__.py

* Update __init__.py

* Update __init__.py

Co-authored-by: Chris Talkington <chris@talkingtontech.com>
This commit is contained in:
Michaël Arnauts 2020-08-09 23:00:14 +02:00 • committed by GitHub
parent abb81704d2
commit d7d7ee6524
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
homeassistant/components/mqtt/__init__.py
View file

@ -28,6 +28,7 @@ from homeassistant.const import (
CONF_VALUE_TEMPLATE,
EVENT_HOMEASSISTANT_STOP,
)
from homeassistant.const import CONF_UNIQUE_ID # noqa: F401
from homeassistant.core import Event, ServiceCall, callback
from homeassistant.exceptions import HomeAssistantError, Unauthorized
from homeassistant.helpers import config_validation as cv, event, template
@ -102,7 +103,6 @@ CONF_PAYLOAD_NOT_AVAILABLE = "payload_not_available"
CONF_JSON_ATTRS_TOPIC = "json_attributes_topic"
CONF_JSON_ATTRS_TEMPLATE = "json_attributes_template"
CONF_UNIQUE_ID = "unique_id"
CONF_IDENTIFIERS = "identifiers"
CONF_CONNECTIONS = "connections"
CONF_MANUFACTURER = "manufacturer"

2
homeassistant/components/mqtt/alarm_control_panel.py
View file

@ -16,6 +16,7 @@ from homeassistant.const import (
CONF_CODE,
CONF_DEVICE,
CONF_NAME,
CONF_UNIQUE_ID,
CONF_VALUE_TEMPLATE,
STATE_ALARM_ARMED_AWAY,
STATE_ALARM_ARMED_CUSTOM_BYPASS,
@ -38,7 +39,6 @@ from . import (
CONF_QOS,
CONF_RETAIN,
CONF_STATE_TOPIC,
CONF_UNIQUE_ID,
MqttAttributes,
MqttAvailability,
MqttDiscoveryUpdate,

2
homeassistant/components/mqtt/binary_sensor.py
View file

@ -16,6 +16,7 @@ from homeassistant.const import (
CONF_NAME,
CONF_PAYLOAD_OFF,
CONF_PAYLOAD_ON,
CONF_UNIQUE_ID,
CONF_VALUE_TEMPLATE,
)
from homeassistant.core import callback
@ -30,7 +31,6 @@ from . import (
ATTR_DISCOVERY_HASH,
CONF_QOS,
CONF_STATE_TOPIC,
CONF_UNIQUE_ID,
MqttAttributes,
MqttAvailability,
MqttDiscoveryUpdate,

3
homeassistant/components/mqtt/camera.py
View file

@ -5,7 +5,7 @@ import voluptuous as vol
from homeassistant.components import camera, mqtt
from homeassistant.components.camera import Camera
from homeassistant.const import CONF_DEVICE, CONF_NAME
from homeassistant.const import CONF_DEVICE, CONF_NAME, CONF_UNIQUE_ID
from homeassistant.core import callback
from homeassistant.helpers import config_validation as cv
from homeassistant.helpers.dispatcher import async_dispatcher_connect
@ -14,7 +14,6 @@ from homeassistant.helpers.typing import ConfigType, HomeAssistantType
from . import (
ATTR_DISCOVERY_HASH,
CONF_QOS,
CONF_UNIQUE_ID,
MqttAttributes,
MqttAvailability,
MqttDiscoveryUpdate,

2
homeassistant/components/mqtt/climate.py
View file

@ -38,6 +38,7 @@ from homeassistant.const import (
CONF_DEVICE,
CONF_NAME,
CONF_TEMPERATURE_UNIT,
CONF_UNIQUE_ID,
CONF_VALUE_TEMPLATE,
PRECISION_HALVES,
PRECISION_TENTHS,
@ -53,7 +54,6 @@ from . import (
ATTR_DISCOVERY_HASH,
CONF_QOS,
CONF_RETAIN,
CONF_UNIQUE_ID,
MQTT_BASE_PLATFORM_SCHEMA,
MqttAttributes,
MqttAvailability,

2
homeassistant/components/mqtt/cover.py
View file

@ -23,6 +23,7 @@ from homeassistant.const import (
CONF_DEVICE_CLASS,
CONF_NAME,
CONF_OPTIMISTIC,
CONF_UNIQUE_ID,
CONF_VALUE_TEMPLATE,
STATE_CLOSED,
STATE_CLOSING,
@ -41,7 +42,6 @@ from . import (
CONF_QOS,
CONF_RETAIN,
CONF_STATE_TOPIC,
CONF_UNIQUE_ID,
MqttAttributes,
MqttAvailability,
MqttDiscoveryUpdate,

2
homeassistant/components/mqtt/fan.py
View file

@ -21,6 +21,7 @@ from homeassistant.const import (
CONF_PAYLOAD_OFF,
CONF_PAYLOAD_ON,
CONF_STATE,
CONF_UNIQUE_ID,
)
from homeassistant.core import callback
import homeassistant.helpers.config_validation as cv
@ -33,7 +34,6 @@ from . import (
CONF_QOS,
CONF_RETAIN,
CONF_STATE_TOPIC,
CONF_UNIQUE_ID,
MqttAttributes,
MqttAvailability,
MqttDiscoveryUpdate,

2
homeassistant/components/mqtt/light/schema_basic.py
View file

@ -22,7 +22,6 @@ from homeassistant.components.mqtt import (
CONF_QOS,
CONF_RETAIN,
CONF_STATE_TOPIC,
CONF_UNIQUE_ID,
MqttAttributes,
MqttAvailability,
MqttDiscoveryUpdate,
@ -41,6 +40,7 @@ from homeassistant.const import (
CONF_PAYLOAD_ON,
CONF_RGB,
CONF_STATE,
CONF_UNIQUE_ID,
CONF_VALUE_TEMPLATE,
CONF_WHITE_VALUE,
CONF_XY,

2
homeassistant/components/mqtt/light/schema_json.py
View file

@ -29,7 +29,6 @@ from homeassistant.components.mqtt import (
CONF_QOS,
CONF_RETAIN,
CONF_STATE_TOPIC,
CONF_UNIQUE_ID,
MqttAttributes,
MqttAvailability,
MqttDiscoveryUpdate,
@ -44,6 +43,7 @@ from homeassistant.const import (
CONF_NAME,
CONF_OPTIMISTIC,
CONF_RGB,
CONF_UNIQUE_ID,
CONF_WHITE_VALUE,
CONF_XY,
STATE_ON,

2
homeassistant/components/mqtt/light/schema_template.py
View file

@ -26,7 +26,6 @@ from homeassistant.components.mqtt import (
CONF_QOS,
CONF_RETAIN,
CONF_STATE_TOPIC,
CONF_UNIQUE_ID,
MqttAttributes,
MqttAvailability,
MqttDiscoveryUpdate,
@ -37,6 +36,7 @@ from homeassistant.const import (
CONF_DEVICE,
CONF_NAME,
CONF_OPTIMISTIC,
CONF_UNIQUE_ID,
STATE_OFF,
STATE_ON,
)

2
homeassistant/components/mqtt/lock.py
View file

@ -9,6 +9,7 @@ from homeassistant.const import (
CONF_DEVICE,
CONF_NAME,
CONF_OPTIMISTIC,
CONF_UNIQUE_ID,
CONF_VALUE_TEMPLATE,
)
from homeassistant.core import callback
@ -22,7 +23,6 @@ from . import (
CONF_QOS,
CONF_RETAIN,
CONF_STATE_TOPIC,
CONF_UNIQUE_ID,
MqttAttributes,
MqttAvailability,
MqttDiscoveryUpdate,

2
homeassistant/components/mqtt/sensor.py
View file

@ -13,6 +13,7 @@ from homeassistant.const import (
CONF_FORCE_UPDATE,
CONF_ICON,
CONF_NAME,
CONF_UNIQUE_ID,
CONF_UNIT_OF_MEASUREMENT,
CONF_VALUE_TEMPLATE,
)
@ -28,7 +29,6 @@ from . import (
ATTR_DISCOVERY_HASH,
CONF_QOS,
CONF_STATE_TOPIC,
CONF_UNIQUE_ID,
MqttAttributes,
MqttAvailability,
MqttDiscoveryUpdate,

2
homeassistant/components/mqtt/switch.py
View file

@ -12,6 +12,7 @@ from homeassistant.const import (
CONF_OPTIMISTIC,
CONF_PAYLOAD_OFF,
CONF_PAYLOAD_ON,
CONF_UNIQUE_ID,
CONF_VALUE_TEMPLATE,
STATE_ON,
)
@ -27,7 +28,6 @@ from . import (
CONF_QOS,
CONF_RETAIN,
CONF_STATE_TOPIC,
CONF_UNIQUE_ID,
MqttAttributes,
MqttAvailability,
MqttDiscoveryUpdate,

8
homeassistant/components/mqtt/vacuum/schema_legacy.py
View file

@ -6,7 +6,6 @@ import voluptuous as vol
from homeassistant.components import mqtt
from homeassistant.components.mqtt import (
CONF_UNIQUE_ID,
MqttAttributes,
MqttAvailability,
MqttDiscoveryUpdate,
@ -27,7 +26,12 @@ from homeassistant.components.vacuum import (
SUPPORT_TURN_ON,
VacuumEntity,
)
from homeassistant.const import ATTR_SUPPORTED_FEATURES, CONF_DEVICE, CONF_NAME
from homeassistant.const import (
ATTR_SUPPORTED_FEATURES,
CONF_DEVICE,
CONF_NAME,
CONF_UNIQUE_ID,
)
from homeassistant.core import callback
import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.icon import icon_for_battery_level

8
homeassistant/components/mqtt/vacuum/schema_state.py
View file

@ -10,7 +10,6 @@ from homeassistant.components.mqtt import (
CONF_QOS,
CONF_RETAIN,
CONF_STATE_TOPIC,
CONF_UNIQUE_ID,
MqttAttributes,
MqttAvailability,
MqttDiscoveryUpdate,
@ -36,7 +35,12 @@ from homeassistant.components.vacuum import (
SUPPORT_STOP,
StateVacuumEntity,
)
from homeassistant.const import ATTR_SUPPORTED_FEATURES, CONF_DEVICE, CONF_NAME
from homeassistant.const import (
ATTR_SUPPORTED_FEATURES,
CONF_DEVICE,
CONF_NAME,
CONF_UNIQUE_ID,
)
from homeassistant.core import callback
import homeassistant.helpers.config_validation as cv