Undo str_schema

home-assistant · Sep 4, 2016 · 33598b9 · 33598b9
1 parent 7c4560d
commit 33598b9
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/homeassistant/components/device_tracker/aruba.py b/homeassistant/components/device_tracker/aruba.py
@@ -9,7 +9,9 @@
 import threading
 from datetime import timedelta
 
-from homeassistant.helpers.config_validation import string_schema
+import voluptuous as vol
+
+import homeassistant.helpers.config_validation as cv
 from homeassistant.components.device_tracker import DOMAIN, PLATFORM_SCHEMA
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.util import Throttle
@@ -25,8 +27,11 @@
     r'(?P<ip>([0-9]{1,3}[\.]){3}[0-9]{1,3})\s+' +
     r'(?P<mac>(([0-9a-f]{2}[:-]){5}([0-9a-f]{2})))\s+')
 
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
-    string_schema(CONF_USERNAME, CONF_PASSWORD, CONF_HOST))
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_HOST): cv.string,
+    vol.Required(CONF_PASSWORD): cv.string,
+    vol.Required(CONF_USERNAME): cv.string
+})
 
 
 # pylint: disable=unused-argument

diff --git a/homeassistant/components/device_tracker/luci.py b/homeassistant/components/device_tracker/luci.py
@@ -11,8 +11,9 @@
 from datetime import timedelta
 
 import requests
+import voluptuous as vol
 
-from homeassistant.helpers.config_validation import string_schema
+import homeassistant.helpers.config_validation as cv
 from homeassistant.components.device_tracker import DOMAIN, PLATFORM_SCHEMA
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.util import Throttle
@@ -22,8 +23,11 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
-    string_schema(CONF_USERNAME, CONF_PASSWORD, CONF_HOST))
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_HOST): cv.string,
+    vol.Required(CONF_USERNAME): cv.string,
+    vol.Required(CONF_PASSWORD): cv.string
+})
 
 
 def get_scanner(hass, config):

diff --git a/homeassistant/components/device_tracker/netgear.py b/homeassistant/components/device_tracker/netgear.py
@@ -26,11 +26,12 @@
 DEFAULT_USER = 'admin'
 DEFAULT_PORT = 5000
 
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
-    cv.string_schema(CONF_PASSWORD,
-                     vol.Optional(CONF_USERNAME, default=DEFAULT_USER),
-                     vol.Optional(CONF_HOST, default=DEFAULT_HOST))
-).extend({vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port})
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
+    vol.Optional(CONF_USERNAME, default=DEFAULT_USER): cv.string,
+    vol.Required(CONF_PASSWORD): cv.string,
+    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port
+})
 
 
 def get_scanner(hass, config):

diff --git a/homeassistant/helpers/config_validation.py b/homeassistant/helpers/config_validation.py
@@ -402,9 +402,3 @@ def validator(value):
     [vol.Any(SERVICE_SCHEMA, _SCRIPT_DELAY_SCHEMA, EVENT_SCHEMA,
              CONDITION_SCHEMA)],
 )
-
-
-def string_schema(*args: Sequence) -> Dict:
-    """Return a schema dict of Required values or Optional values."""
-    return {val if isinstance(val, vol.Optional) else vol.Required(val): string
-            for val in args}