diff --git a/homeassistant/components/climate/honeywell.py b/homeassistant/components/climate/honeywell.py index 0b2df903e17..253a5625ef3 100644 --- a/homeassistant/components/climate/honeywell.py +++ b/homeassistant/components/climate/honeywell.py @@ -11,16 +11,15 @@ import datetime import requests import voluptuous as vol +import homeassistant.helpers.config_validation as cv from homeassistant.components.climate import ( ClimateDevice, PLATFORM_SCHEMA, ATTR_FAN_MODE, ATTR_FAN_LIST, ATTR_OPERATION_MODE, ATTR_OPERATION_LIST) from homeassistant.const import ( CONF_PASSWORD, CONF_USERNAME, TEMP_CELSIUS, TEMP_FAHRENHEIT, - ATTR_TEMPERATURE) -import homeassistant.helpers.config_validation as cv + ATTR_TEMPERATURE, CONF_REGION) -REQUIREMENTS = ['evohomeclient==0.2.5', - 'somecomfort==0.4.1'] +REQUIREMENTS = ['evohomeclient==0.2.5', 'somecomfort==0.4.1'] _LOGGER = logging.getLogger(__name__) @@ -31,7 +30,6 @@ ATTR_CURRENT_OPERATION = 'equipment_output_status' CONF_AWAY_TEMPERATURE = 'away_temperature' CONF_COOL_AWAY_TEMPERATURE = 'away_cool_temperature' CONF_HEAT_AWAY_TEMPERATURE = 'away_heat_temperature' -CONF_REGION = 'region' DEFAULT_AWAY_TEMPERATURE = 16 DEFAULT_COOL_AWAY_TEMPERATURE = 30 diff --git a/homeassistant/components/cloud/__init__.py b/homeassistant/components/cloud/__init__.py index c711b00fdd2..c5d709d60c3 100644 --- a/homeassistant/components/cloud/__init__.py +++ b/homeassistant/components/cloud/__init__.py @@ -6,22 +6,23 @@ import os import voluptuous as vol -from homeassistant.const import EVENT_HOMEASSISTANT_START +from homeassistant.const import ( + EVENT_HOMEASSISTANT_START, CONF_REGION, CONF_MODE) from . import http_api, iot from .const import CONFIG_DIR, DOMAIN, SERVERS - REQUIREMENTS = ['warrant==0.5.0'] -DEPENDENCIES = ['http'] -CONF_MODE = 'mode' + +_LOGGER = logging.getLogger(__name__) + CONF_COGNITO_CLIENT_ID = 'cognito_client_id' -CONF_USER_POOL_ID = 'user_pool_id' -CONF_REGION = 'region' CONF_RELAYER = 'relayer' +CONF_USER_POOL_ID = 'user_pool_id' + MODE_DEV = 'development' DEFAULT_MODE = MODE_DEV -_LOGGER = logging.getLogger(__name__) +DEPENDENCIES = ['http'] CONFIG_SCHEMA = vol.Schema({ DOMAIN: vol.Schema({ diff --git a/homeassistant/components/device_tracker/asuswrt.py b/homeassistant/components/device_tracker/asuswrt.py index 9b214441ac9..f2d2a4c74b5 100644 --- a/homeassistant/components/device_tracker/asuswrt.py +++ b/homeassistant/components/device_tracker/asuswrt.py @@ -12,18 +12,17 @@ from collections import namedtuple import voluptuous as vol +import homeassistant.helpers.config_validation as cv from homeassistant.components.device_tracker import ( DOMAIN, PLATFORM_SCHEMA, DeviceScanner) from homeassistant.const import ( - CONF_HOST, CONF_PASSWORD, CONF_USERNAME, CONF_PORT) -import homeassistant.helpers.config_validation as cv + CONF_HOST, CONF_PASSWORD, CONF_USERNAME, CONF_PORT, CONF_MODE, + CONF_PROTOCOL) REQUIREMENTS = ['pexpect==4.0.1'] _LOGGER = logging.getLogger(__name__) -CONF_MODE = 'mode' -CONF_PROTOCOL = 'protocol' CONF_PUB_KEY = 'pub_key' CONF_SSH_KEY = 'ssh_key' @@ -36,10 +35,8 @@ PLATFORM_SCHEMA = vol.All( PLATFORM_SCHEMA.extend({ vol.Required(CONF_HOST): cv.string, vol.Required(CONF_USERNAME): cv.string, - vol.Optional(CONF_PROTOCOL, default='ssh'): - vol.In(['ssh', 'telnet']), - vol.Optional(CONF_MODE, default='router'): - vol.In(['router', 'ap']), + vol.Optional(CONF_PROTOCOL, default='ssh'): vol.In(['ssh', 'telnet']), + vol.Optional(CONF_MODE, default='router'): vol.In(['router', 'ap']), vol.Optional(CONF_PORT, default=DEFAULT_SSH_PORT): cv.port, vol.Exclusive(CONF_PASSWORD, SECRET_GROUP): cv.string, vol.Exclusive(CONF_SSH_KEY, SECRET_GROUP): cv.isfile, @@ -102,21 +99,18 @@ class AsusWrtDeviceScanner(DeviceScanner): self.success_init = False return - self.connection = SshConnection(self.host, self.port, - self.username, - self.password, - self.ssh_key, - self.mode == "ap") + self.connection = SshConnection( + self.host, self.port, self.username, self.password, + self.ssh_key, self.mode == 'ap') else: if not self.password: _LOGGER.error("No password specified") self.success_init = False return - self.connection = TelnetConnection(self.host, self.port, - self.username, - self.password, - self.mode == "ap") + self.connection = TelnetConnection( + self.host, self.port, self.username, self.password, + self.mode == 'ap') self.last_results = {} diff --git a/homeassistant/components/image_processing/openalpr_local.py b/homeassistant/components/image_processing/openalpr_local.py index b0ef93611ea..ce06d98bf13 100644 --- a/homeassistant/components/image_processing/openalpr_local.py +++ b/homeassistant/components/image_processing/openalpr_local.py @@ -13,7 +13,7 @@ import voluptuous as vol import homeassistant.helpers.config_validation as cv from homeassistant.core import split_entity_id, callback -from homeassistant.const import STATE_UNKNOWN +from homeassistant.const import STATE_UNKNOWN, CONF_REGION from homeassistant.components.image_processing import ( PLATFORM_SCHEMA, ImageProcessingEntity, CONF_CONFIDENCE, CONF_SOURCE, CONF_ENTITY_ID, CONF_NAME, ATTR_ENTITY_ID, ATTR_CONFIDENCE) @@ -46,7 +46,6 @@ OPENALPR_REGIONS = [ ] CONF_ALPR_BIN = 'alp_bin' -CONF_REGION = 'region' DEFAULT_BINARY = 'alpr' diff --git a/homeassistant/components/input_number.py b/homeassistant/components/input_number.py index 27aaa752950..856cdac1e4b 100644 --- a/homeassistant/components/input_number.py +++ b/homeassistant/components/input_number.py @@ -10,14 +10,14 @@ import logging import voluptuous as vol -from homeassistant.config import load_yaml_config_file import homeassistant.helpers.config_validation as cv +from homeassistant.config import load_yaml_config_file from homeassistant.const import ( - ATTR_ENTITY_ID, ATTR_UNIT_OF_MEASUREMENT, CONF_ICON, CONF_NAME) -from homeassistant.loader import bind_hass + ATTR_ENTITY_ID, ATTR_UNIT_OF_MEASUREMENT, CONF_ICON, CONF_NAME, CONF_MODE) from homeassistant.helpers.entity import Entity from homeassistant.helpers.entity_component import EntityComponent from homeassistant.helpers.restore_state import async_get_last_state +from homeassistant.loader import bind_hass _LOGGER = logging.getLogger(__name__) @@ -27,7 +27,6 @@ ENTITY_ID_FORMAT = DOMAIN + '.{}' CONF_INITIAL = 'initial' CONF_MIN = 'min' CONF_MAX = 'max' -CONF_MODE = 'mode' CONF_STEP = 'step' MODE_SLIDER = 'slider' @@ -180,7 +179,7 @@ def async_setup(hass, config): class InputNumber(Entity): - """Represent an slider.""" + """Representation of a slider.""" def __init__(self, object_id, name, initial, minimum, maximum, step, icon, unit, mode): diff --git a/homeassistant/components/sensor/google_travel_time.py b/homeassistant/components/sensor/google_travel_time.py index fe0db29eb92..e7d25872701 100644 --- a/homeassistant/components/sensor/google_travel_time.py +++ b/homeassistant/components/sensor/google_travel_time.py @@ -14,7 +14,7 @@ from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.helpers.entity import Entity from homeassistant.const import ( CONF_API_KEY, CONF_NAME, EVENT_HOMEASSISTANT_START, ATTR_LATITUDE, - ATTR_LONGITUDE) + ATTR_LONGITUDE, CONF_MODE) from homeassistant.util import Throttle import homeassistant.helpers.config_validation as cv import homeassistant.helpers.location as location @@ -25,7 +25,6 @@ REQUIREMENTS = ['googlemaps==2.5.1'] _LOGGER = logging.getLogger(__name__) CONF_DESTINATION = 'destination' -CONF_MODE = 'mode' CONF_OPTIONS = 'options' CONF_ORIGIN = 'origin' CONF_TRAVEL_MODE = 'travel_mode' diff --git a/homeassistant/components/sensor/uk_transport.py b/homeassistant/components/sensor/uk_transport.py index bcac4b47279..9b35afb418c 100644 --- a/homeassistant/components/sensor/uk_transport.py +++ b/homeassistant/components/sensor/uk_transport.py @@ -6,13 +6,15 @@ https://home-assistant.io/components/sensor.uk_transport/ import logging import re from datetime import datetime, timedelta + import requests import voluptuous as vol +import homeassistant.helpers.config_validation as cv from homeassistant.components.sensor import PLATFORM_SCHEMA +from homeassistant.const import CONF_MODE from homeassistant.helpers.entity import Entity from homeassistant.util import Throttle -import homeassistant.helpers.config_validation as cv _LOGGER = logging.getLogger(__name__) @@ -28,7 +30,6 @@ ATTR_NEXT_TRAINS = 'next_trains' CONF_API_APP_KEY = 'app_key' CONF_API_APP_ID = 'app_id' CONF_QUERIES = 'queries' -CONF_MODE = 'mode' CONF_ORIGIN = 'origin' CONF_DESTINATION = 'destination' diff --git a/homeassistant/components/switch/flux.py b/homeassistant/components/switch/flux.py index a232702df39..ff432f2efc8 100644 --- a/homeassistant/components/switch/flux.py +++ b/homeassistant/components/switch/flux.py @@ -11,10 +11,12 @@ import logging import voluptuous as vol +import homeassistant.helpers.config_validation as cv from homeassistant.components.light import ( is_on, turn_on, VALID_TRANSITION, ATTR_TRANSITION) from homeassistant.components.switch import DOMAIN, SwitchDevice -from homeassistant.const import CONF_NAME, CONF_PLATFORM, CONF_LIGHTS +from homeassistant.const import ( + CONF_NAME, CONF_PLATFORM, CONF_LIGHTS, CONF_MODE) from homeassistant.helpers.event import track_time_change from homeassistant.helpers.sun import get_astral_event_date from homeassistant.util import slugify @@ -22,9 +24,6 @@ from homeassistant.util.color import ( color_temperature_to_rgb, color_RGB_to_xy, color_temperature_kelvin_to_mired) from homeassistant.util.dt import now as dt_now -import homeassistant.helpers.config_validation as cv - -DEPENDENCIES = ['light'] _LOGGER = logging.getLogger(__name__) @@ -35,13 +34,14 @@ CONF_SUNSET_CT = 'sunset_colortemp' CONF_STOP_CT = 'stop_colortemp' CONF_BRIGHTNESS = 'brightness' CONF_DISABLE_BRIGTNESS_ADJUST = 'disable_brightness_adjust' -CONF_MODE = 'mode' CONF_INTERVAL = 'interval' MODE_XY = 'xy' MODE_MIRED = 'mired' MODE_RGB = 'rgb' DEFAULT_MODE = MODE_XY +DEPENDENCIES = ['light'] + PLATFORM_SCHEMA = vol.Schema({ vol.Required(CONF_PLATFORM): 'flux', diff --git a/homeassistant/const.py b/homeassistant/const.py index e0e2691d44b..626dc3c8da4 100644 --- a/homeassistant/const.py +++ b/homeassistant/const.py @@ -117,8 +117,9 @@ CONF_LONGITUDE = 'longitude' CONF_LIGHTS = 'lights' CONF_MAC = 'mac' CONF_METHOD = 'method' -CONF_MINIMUM = 'minimum' CONF_MAXIMUM = 'maximum' +CONF_MINIMUM = 'minimum' +CONF_MODE = 'mode' CONF_MONITORED_CONDITIONS = 'monitored_conditions' CONF_MONITORED_VARIABLES = 'monitored_variables' CONF_NAME = 'name' @@ -135,10 +136,12 @@ CONF_PIN = 'pin' CONF_PLATFORM = 'platform' CONF_PORT = 'port' CONF_PREFIX = 'prefix' +CONF_PROFILE_NAME = 'profile_name' CONF_PROTOCOL = 'protocol' CONF_PROXY_SSL = 'proxy_ssl' CONF_QUOTE = 'quote' CONF_RECIPIENT = 'recipient' +CONF_REGION = 'region' CONF_RESOURCE = 'resource' CONF_RESOURCES = 'resources' CONF_RGB = 'rgb' @@ -218,6 +221,9 @@ STATE_PROBLEM = 'problem' # Attribution ATTR_ATTRIBUTION = 'attribution' +# Credentials +ATTR_CREDENTIALS = 'credentials' + # Contains time-related attributes ATTR_NOW = 'now' ATTR_DATE = 'date'