Update voluputous (#12463)

* Update voluputous

* Fix http config

* Fix optional with default=None

* Optional, default=none

* Fix defaults in voluptuous schemas

* Fix tests

* Fix update error

* Lint

homeassistant/components/device_tracker/__init__.py

@@ -649,8 +649,7 @@ def async_load_config(path: str, hass: HomeAssistantType,
     """
     dev_schema = vol.Schema({
         vol.Required(CONF_NAME): cv.string,
-        vol.Optional(CONF_ICON, default=False):
-            vol.Any(None, cv.icon),
+        vol.Optional(CONF_ICON, default=None): vol.Any(None, cv.icon),
         vol.Optional('track', default=False): cv.boolean,
         vol.Optional(CONF_MAC, default=None):
             vol.Any(None, vol.All(cv.string, vol.Upper)),

homeassistant/components/device_tracker/automatic.py

@@ -49,8 +49,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_CLIENT_ID): cv.string,
     vol.Required(CONF_SECRET): cv.string,
     vol.Optional(CONF_CURRENT_LOCATION, default=False): cv.boolean,
-    vol.Optional(CONF_DEVICES, default=None):
-        vol.All(cv.ensure_list, [cv.string]),
+    vol.Optional(CONF_DEVICES): vol.All(cv.ensure_list, [cv.string]),
 })
 
 
@@ -109,7 +108,7 @@ def async_setup_scanner(hass, config, async_see, discovery_info=None):
             _write_refresh_token_to_file, hass, filename,
             session.refresh_token)
         data = AutomaticData(
-            hass, client, session, config[CONF_DEVICES], async_see)
+            hass, client, session, config.get(CONF_DEVICES), async_see)
 
         # Load the initial vehicle data
         vehicles = yield from session.get_vehicles()

homeassistant/components/device_tracker/mqtt_json.py

@@ -26,8 +26,8 @@ _LOGGER = logging.getLogger(__name__)
 GPS_JSON_PAYLOAD_SCHEMA = vol.Schema({
     vol.Required(ATTR_LATITUDE): vol.Coerce(float),
     vol.Required(ATTR_LONGITUDE): vol.Coerce(float),
-    vol.Optional(ATTR_GPS_ACCURACY, default=None): vol.Coerce(int),
-    vol.Optional(ATTR_BATTERY_LEVEL, default=None): vol.Coerce(str),
+    vol.Optional(ATTR_GPS_ACCURACY): vol.Coerce(int),
+    vol.Optional(ATTR_BATTERY_LEVEL): vol.Coerce(str),
 }, extra=vol.ALLOW_EXTRA)
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(mqtt.SCHEMA_BASE).extend({

homeassistant/components/device_tracker/nmap_tracker.py

@@ -33,7 +33,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_HOSTS): cv.ensure_list,
     vol.Required(CONF_HOME_INTERVAL, default=0): cv.positive_int,
     vol.Optional(CONF_EXCLUDE, default=[]):
-        vol.All(cv.ensure_list, vol.Length(min=1)),
+        vol.All(cv.ensure_list, [cv.string]),
     vol.Optional(CONF_OPTIONS, default=DEFAULT_OPTIONS):
         cv.string
 })

homeassistant/components/device_tracker/tomato.py

@@ -24,7 +24,7 @@ _LOGGER = logging.getLogger(__name__)
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_HOST): cv.string,
-    vol.Optional(CONF_PORT, default=-1): cv.port,
+    vol.Optional(CONF_PORT): cv.port,
     vol.Optional(CONF_SSL, default=False): cv.boolean,
     vol.Optional(CONF_VERIFY_SSL, default=True): vol.Any(
         cv.boolean, cv.isfile),
@@ -45,13 +45,11 @@ class TomatoDeviceScanner(DeviceScanner):
     def __init__(self, config):
         """Initialize the scanner."""
         host, http_id = config[CONF_HOST], config[CONF_HTTP_ID]
-        port = config[CONF_PORT]
+        port = config.get(CONF_PORT)
         username, password = config[CONF_USERNAME], config[CONF_PASSWORD]
         self.ssl, self.verify_ssl = config[CONF_SSL], config[CONF_VERIFY_SSL]
-        if port == -1:
-            port = 80
-            if self.ssl:
-                port = 443
+        if port is None:
+            port = 443 if self.ssl else 80
 
         self.req = requests.Request(
             'POST', 'http{}://{}:{}/update.cgi'.format(

homeassistant/components/device_tracker/unifi.py

@@ -27,7 +27,6 @@ DEFAULT_HOST = 'localhost'
 DEFAULT_PORT = 8443
 DEFAULT_VERIFY_SSL = True
 DEFAULT_DETECTION_TIME = timedelta(seconds=300)
-DEFAULT_SSID_FILTER = None
 
 NOTIFICATION_ID = 'unifi_notification'
 NOTIFICATION_TITLE = 'Unifi Device Tracker Setup'
@@ -42,8 +41,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
         cv.boolean, cv.isfile),
     vol.Optional(CONF_DETECTION_TIME, default=DEFAULT_DETECTION_TIME): vol.All(
         cv.time_period, cv.positive_timedelta),
-    vol.Optional(CONF_SSID_FILTER, default=DEFAULT_SSID_FILTER): vol.All(
-        cv.ensure_list, [cv.string])
+    vol.Optional(CONF_SSID_FILTER): vol.All(cv.ensure_list, [cv.string])
 })