From 9982867d667b698794ccb51531280bc4d5dbd7c4 Mon Sep 17 00:00:00 2001
From: emontnemery <erik@montnemery.com>
Date: Sun, 21 Oct 2018 13:05:02 +0200
Subject: [PATCH] Very minor cleanup of RFLink components (#17649)

---
 homeassistant/components/light/rflink.py  | 13 +++++++------
 homeassistant/components/sensor/rflink.py |  5 ++++-
 homeassistant/components/switch/rflink.py |  7 ++++---
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/homeassistant/components/light/rflink.py b/homeassistant/components/light/rflink.py
index 885239a51c3..3b60280c582 100644
--- a/homeassistant/components/light/rflink.py
+++ b/homeassistant/components/light/rflink.py
@@ -6,16 +6,18 @@ https://home-assistant.io/components/light.rflink/
 """
 import logging
 
+import voluptuous as vol
+
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS, PLATFORM_SCHEMA, SUPPORT_BRIGHTNESS, Light)
 from homeassistant.components.rflink import (
     CONF_ALIASES, CONF_ALIASSES, CONF_AUTOMATIC_ADD, CONF_DEVICE_DEFAULTS,
     CONF_DEVICES, CONF_FIRE_EVENT, CONF_GROUP, CONF_GROUP_ALIASES,
-    CONF_GROUP_ALIASSES, CONF_IGNORE_DEVICES, CONF_NOGROUP_ALIASES,
-    CONF_NOGROUP_ALIASSES, CONF_SIGNAL_REPETITIONS, DATA_DEVICE_REGISTER,
-    DEVICE_DEFAULTS_SCHEMA,
-    EVENT_KEY_COMMAND, EVENT_KEY_ID, SwitchableRflinkDevice, cv,
-    remove_deprecated, vol)
+    CONF_GROUP_ALIASSES, CONF_NOGROUP_ALIASES, CONF_NOGROUP_ALIASSES,
+    CONF_SIGNAL_REPETITIONS, DATA_DEVICE_REGISTER, DEVICE_DEFAULTS_SCHEMA,
+    EVENT_KEY_COMMAND, EVENT_KEY_ID, SwitchableRflinkDevice,
+    remove_deprecated)
+import homeassistant.helpers.config_validation as cv
 from homeassistant.const import (CONF_NAME, CONF_TYPE)
 
 DEPENDENCIES = ['rflink']
@@ -28,7 +30,6 @@ TYPE_HYBRID = 'hybrid'
 TYPE_TOGGLE = 'toggle'
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_IGNORE_DEVICES): vol.All(cv.ensure_list, [cv.string]),
     vol.Optional(CONF_DEVICE_DEFAULTS, default=DEVICE_DEFAULTS_SCHEMA({})):
         DEVICE_DEFAULTS_SCHEMA,
     vol.Optional(CONF_AUTOMATIC_ADD, default=True): cv.boolean,
diff --git a/homeassistant/components/sensor/rflink.py b/homeassistant/components/sensor/rflink.py
index 4065e0a439f..f3ec776fda8 100644
--- a/homeassistant/components/sensor/rflink.py
+++ b/homeassistant/components/sensor/rflink.py
@@ -6,13 +6,16 @@ https://home-assistant.io/components/sensor.rflink/
 """
 import logging
 
+import voluptuous as vol
+
 from homeassistant.components.rflink import (
     CONF_ALIASES, CONF_ALIASSES, CONF_AUTOMATIC_ADD, CONF_DEVICES,
     DATA_DEVICE_REGISTER, DATA_ENTITY_LOOKUP, EVENT_KEY_ID,
-    EVENT_KEY_SENSOR, EVENT_KEY_UNIT, RflinkDevice, cv, remove_deprecated, vol,
+    EVENT_KEY_SENSOR, EVENT_KEY_UNIT, RflinkDevice, remove_deprecated,
     SIGNAL_AVAILABILITY, SIGNAL_HANDLE_EVENT, TMP_ENTITY)
 from homeassistant.components.sensor import (
     PLATFORM_SCHEMA)
+import homeassistant.helpers.config_validation as cv
 from homeassistant.const import (
     ATTR_UNIT_OF_MEASUREMENT, CONF_NAME, CONF_UNIT_OF_MEASUREMENT)
 from homeassistant.helpers.dispatcher import (async_dispatcher_connect)
diff --git a/homeassistant/components/switch/rflink.py b/homeassistant/components/switch/rflink.py
index 1f217b1c39c..51bf5543584 100644
--- a/homeassistant/components/switch/rflink.py
+++ b/homeassistant/components/switch/rflink.py
@@ -6,15 +6,16 @@ https://home-assistant.io/components/switch.rflink/
 """
 import logging
 
+import voluptuous as vol
+
 from homeassistant.components.rflink import (
     CONF_ALIASES, CONF_ALIASSES, CONF_DEVICE_DEFAULTS, CONF_DEVICES,
     CONF_FIRE_EVENT, CONF_GROUP, CONF_GROUP_ALIASES, CONF_GROUP_ALIASSES,
     CONF_NOGROUP_ALIASES, CONF_NOGROUP_ALIASSES, CONF_SIGNAL_REPETITIONS,
-    DEVICE_DEFAULTS_SCHEMA, SwitchableRflinkDevice, cv,
-    remove_deprecated, vol)
+    DEVICE_DEFAULTS_SCHEMA, SwitchableRflinkDevice, remove_deprecated)
 from homeassistant.components.switch import (
     PLATFORM_SCHEMA, SwitchDevice)
-
+import homeassistant.helpers.config_validation as cv
 from homeassistant.const import CONF_NAME
 
 DEPENDENCIES = ['rflink']