Use constants and update ordering (#3268)

🐬

homeassistant/components/binary_sensor/mqtt.py

@@ -9,45 +9,42 @@ import logging
 import voluptuous as vol
 
 import homeassistant.components.mqtt as mqtt
-from homeassistant.components.binary_sensor import (BinarySensorDevice,
-                                                    SENSOR_CLASSES)
-from homeassistant.const import CONF_NAME, CONF_VALUE_TEMPLATE
-from homeassistant.components.mqtt import CONF_STATE_TOPIC, CONF_QOS
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, SENSOR_CLASSES)
+from homeassistant.const import (
+    CONF_NAME, CONF_VALUE_TEMPLATE, CONF_PAYLOAD_ON, CONF_PAYLOAD_OFF,
+    CONF_SENSOR_CLASS)
+from homeassistant.components.mqtt import (CONF_STATE_TOPIC, CONF_QOS)
 from homeassistant.helpers import template
 import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 
-DEPENDENCIES = ['mqtt']
-
-CONF_SENSOR_CLASS = 'sensor_class'
-CONF_PAYLOAD_ON = 'payload_on'
-CONF_PAYLOAD_OFF = 'payload_off'
-
 DEFAULT_NAME = 'MQTT Binary sensor'
-DEFAULT_PAYLOAD_ON = 'ON'
 DEFAULT_PAYLOAD_OFF = 'OFF'
+DEFAULT_PAYLOAD_ON = 'ON'
+DEPENDENCIES = ['mqtt']
 
 PLATFORM_SCHEMA = mqtt.MQTT_RO_PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    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_SENSOR_CLASS, default=None):
         vol.Any(vol.In(SENSOR_CLASSES), vol.SetTo(None)),
-    vol.Optional(CONF_PAYLOAD_ON, default=DEFAULT_PAYLOAD_ON): cv.string,
-    vol.Optional(CONF_PAYLOAD_OFF, default=DEFAULT_PAYLOAD_OFF): cv.string,
 })
 
 
 # pylint: disable=unused-argument
 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """Add MQTT binary sensor."""
+    """Setup the MQTT binary sensor."""
     add_devices([MqttBinarySensor(
         hass,
-        config[CONF_NAME],
-        config[CONF_STATE_TOPIC],
-        config[CONF_SENSOR_CLASS],
-        config[CONF_QOS],
-        config[CONF_PAYLOAD_ON],
-        config[CONF_PAYLOAD_OFF],
+        config.get(CONF_NAME),
+        config.get(CONF_STATE_TOPIC),
+        config.get(CONF_SENSOR_CLASS),
+        config.get(CONF_QOS),
+        config.get(CONF_PAYLOAD_ON),
+        config.get(CONF_PAYLOAD_OFF),
         config.get(CONF_VALUE_TEMPLATE)
     )])