jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-26 06:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use dict[key] for required config keys and keys with default values. (#22829)

Browse Source
This commit is contained in:
Erik Montnemery 2019-04-07 16:11:20 +02:00 committed by Fabian Affolter
parent dbb42e5890
commit 58220a9448
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
homeassistant/components/mqtt/binary_sensor.py
View File

@ -32,17 +32,15 @@ DEFAULT_FORCE_UPDATE = False
DEPENDENCIES = ['mqtt'] DEPENDENCIES = ['mqtt']
PLATFORM_SCHEMA = mqtt.MQTT_RO_PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = mqtt.MQTT_RO_PLATFORM_SCHEMA.extend({
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, vol.Optional(CONF_DEVICE): mqtt.MQTT_ENTITY_DEVICE_INFO_SCHEMA,
vol.Optional(CONF_PAYLOAD_OFF, default=DEFAULT_PAYLOAD_OFF): cv.string,
vol.Optional(CONF_PAYLOAD_ON, default=DEFAULT_PAYLOAD_ON): cv.string,
vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA, vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
vol.Optional(CONF_FORCE_UPDATE, default=DEFAULT_FORCE_UPDATE): cv.boolean, vol.Optional(CONF_FORCE_UPDATE, default=DEFAULT_FORCE_UPDATE): cv.boolean,
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
vol.Optional(CONF_OFF_DELAY): vol.Optional(CONF_OFF_DELAY):
vol.All(vol.Coerce(int), vol.Range(min=0)), vol.All(vol.Coerce(int), vol.Range(min=0)),
# Integrations should never expose unique_id through configuration. vol.Optional(CONF_PAYLOAD_OFF, default=DEFAULT_PAYLOAD_OFF): cv.string,
# This is an exception because MQTT is a message transport, not a protocol vol.Optional(CONF_PAYLOAD_ON, default=DEFAULT_PAYLOAD_ON): cv.string,
vol.Optional(CONF_UNIQUE_ID): cv.string, vol.Optional(CONF_UNIQUE_ID): cv.string,
vol.Optional(CONF_DEVICE): mqtt.MQTT_ENTITY_DEVICE_INFO_SCHEMA,
}).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema).extend( }).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema).extend(
mqtt.MQTT_JSON_ATTRS_SCHEMA.schema) mqtt.MQTT_JSON_ATTRS_SCHEMA.schema)
@ -135,15 +133,15 @@ class MqttBinarySensor(MqttAttributes, MqttAvailability, MqttDiscoveryUpdate,
if value_template is not None: if value_template is not None:
payload = value_template.async_render_with_possible_json_value( payload = value_template.async_render_with_possible_json_value(
payload, variables={'entity_id': self.entity_id}) payload, variables={'entity_id': self.entity_id})
if payload == self._config.get(CONF_PAYLOAD_ON): if payload == self._config[CONF_PAYLOAD_ON]:
self._state = True self._state = True
elif payload == self._config.get(CONF_PAYLOAD_OFF): elif payload == self._config[CONF_PAYLOAD_OFF]:
self._state = False self._state = False
else: # Payload is not for this entity else: # Payload is not for this entity
_LOGGER.warning('No matching payload found' _LOGGER.warning('No matching payload found'
' for entity: %s with state_topic: %s', ' for entity: %s with state_topic: %s',
self._config.get(CONF_NAME), self._config[CONF_NAME],
self._config.get(CONF_STATE_TOPIC)) self._config[CONF_STATE_TOPIC])
return return
if self._delay_listener is not None: if self._delay_listener is not None:
@ -159,9 +157,9 @@ class MqttBinarySensor(MqttAttributes, MqttAvailability, MqttDiscoveryUpdate,
self._sub_state = await subscription.async_subscribe_topics( self._sub_state = await subscription.async_subscribe_topics(
self.hass, self._sub_state, self.hass, self._sub_state,
{'state_topic': {'topic': self._config.get(CONF_STATE_TOPIC), {'state_topic': {'topic': self._config[CONF_STATE_TOPIC],
'msg_callback': state_message_received, 'msg_callback': state_message_received,
'qos': self._config.get(CONF_QOS)}}) 'qos': self._config[CONF_QOS]}})
async def async_will_remove_from_hass(self): async def async_will_remove_from_hass(self):
"""Unsubscribe when removed.""" """Unsubscribe when removed."""
@ -178,7 +176,7 @@ class MqttBinarySensor(MqttAttributes, MqttAvailability, MqttDiscoveryUpdate,
@property @property
def name(self): def name(self):
"""Return the name of the binary sensor.""" """Return the name of the binary sensor."""
return self._config.get(CONF_NAME) return self._config[CONF_NAME]
@property @property
def is_on(self): def is_on(self):
@ -193,7 +191,7 @@ class MqttBinarySensor(MqttAttributes, MqttAvailability, MqttDiscoveryUpdate,
@property @property
def force_update(self): def force_update(self):
"""Force update.""" """Force update."""
return self._config.get(CONF_FORCE_UPDATE) return self._config[CONF_FORCE_UPDATE]
@property @property
def unique_id(self): def unique_id(self):