From 6ae4e5cb6c93197605ef0e81f0c5642bb93c90ba Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 3 Sep 2016 00:09:14 +0200
Subject: [PATCH] Use constants (#3148)

---
 homeassistant/components/switch/orvibo.py | 18 ++++++++----------
 homeassistant/const.py                    |  2 ++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/homeassistant/components/switch/orvibo.py b/homeassistant/components/switch/orvibo.py
index 274b2cd40ca..0ce1426dd1f 100644
--- a/homeassistant/components/switch/orvibo.py
+++ b/homeassistant/components/switch/orvibo.py
@@ -8,34 +8,32 @@ import logging
 
 import voluptuous as vol
 
-from homeassistant.components.switch import SwitchDevice, PLATFORM_SCHEMA
+from homeassistant.components.switch import (SwitchDevice, PLATFORM_SCHEMA)
+from homeassistant.const import (
+    CONF_HOST, CONF_NAME, CONF_SWITCHES, CONF_MAC, CONF_DISCOVERY)
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['orvibo==1.1.1']
+
 _LOGGER = logging.getLogger(__name__)
 
-CONF_SWITCHES = 'switches'
-CONF_HOST = 'host'
-CONF_NAME = 'name'
-CONF_MAC = 'mac'
-CONF_DISCOVERY = 'discovery'
 DEFAULT_NAME = 'Orvibo S20 Switch'
 DEFAULT_DISCOVERY = True
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_DISCOVERY, default=DEFAULT_DISCOVERY): cv.boolean,
     vol.Required(CONF_SWITCHES, default=[]):
         vol.All(cv.ensure_list, [{
             vol.Required(CONF_HOST): cv.string,
             vol.Optional(CONF_MAC): cv.string,
             vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string
-        }])
+        }]),
+    vol.Optional(CONF_DISCOVERY, default=DEFAULT_DISCOVERY): cv.boolean,
 })
 
 
 # pylint: disable=unused-argument
 def setup_platform(hass, config, add_devices_callback, discovery_info=None):
-    """Find and return S20 switches."""
+    """Setup S20 switches."""
     from orvibo.s20 import discover, S20, S20Exception
 
     switch_data = {}
@@ -51,7 +49,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
 
     for host, data in switch_data.items():
         try:
-            switches.append(S20Switch(data.get(CONF_NAME, DEFAULT_NAME),
+            switches.append(S20Switch(data.get(CONF_NAME),
                                       S20(host, mac=data.get(CONF_MAC))))
             _LOGGER.info("Initialized S20 at %s", host)
         except S20Exception:
diff --git a/homeassistant/const.py b/homeassistant/const.py
index f3c016015e6..ce0d829e76b 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -41,6 +41,7 @@ CONF_CUSTOMIZE = 'customize'
 CONF_DEVICE = 'device'
 CONF_DEVICES = 'devices'
 CONF_DISARM_AFTER_TRIGGER = 'disarm_after_trigger'
+CONF_DISCOVERY = 'discovery'
 CONF_DISPLAY_OPTIONS = 'display_options'
 CONF_ELEVATION = 'elevation'
 CONF_ENTITY_ID = 'entity_id'
@@ -55,6 +56,7 @@ CONF_ICON = 'icon'
 CONF_ID = 'id'
 CONF_LATITUDE = 'latitude'
 CONF_LONGITUDE = 'longitude'
+CONF_MAC = 'mac'
 CONF_METHOD = 'method'
 CONF_MONITORED_CONDITIONS = 'monitored_conditions'
 CONF_MONITORED_VARIABLES = 'monitored_variables'