From cc74035c3bfff501b3af7441c6434e79b9223fa6 Mon Sep 17 00:00:00 2001 From: Rohan Kapoor Date: Mon, 28 Jan 2019 20:26:31 -0800 Subject: [PATCH] Move CONF_UPDATE_INTERVAL to homeassistant.const (#20526) --- homeassistant/components/freedns.py | 5 ++--- homeassistant/components/mythicbeastsdns.py | 5 ++--- homeassistant/components/sensor/broadlink.py | 3 +-- homeassistant/components/sensor/darksky.py | 3 +-- homeassistant/components/sensor/fedex.py | 3 +-- homeassistant/components/sensor/magicseaweed.py | 1 - homeassistant/components/sensor/ups.py | 3 +-- homeassistant/components/tellduslive/__init__.py | 3 ++- homeassistant/components/tellduslive/const.py | 1 - homeassistant/components/volvooncall.py | 4 ++-- homeassistant/const.py | 1 + 11 files changed, 13 insertions(+), 19 deletions(-) diff --git a/homeassistant/components/freedns.py b/homeassistant/components/freedns.py index 0b5cbeda01a..ec38bb59cc7 100644 --- a/homeassistant/components/freedns.py +++ b/homeassistant/components/freedns.py @@ -12,7 +12,8 @@ import aiohttp import async_timeout import voluptuous as vol -from homeassistant.const import (CONF_URL, CONF_ACCESS_TOKEN) +from homeassistant.const import (CONF_URL, CONF_ACCESS_TOKEN, + CONF_UPDATE_INTERVAL) import homeassistant.helpers.config_validation as cv _LOGGER = logging.getLogger(__name__) @@ -24,8 +25,6 @@ DEFAULT_INTERVAL = timedelta(minutes=10) TIMEOUT = 10 UPDATE_URL = 'https://freedns.afraid.org/dynamic/update.php' -CONF_UPDATE_INTERVAL = 'update_interval' - CONFIG_SCHEMA = vol.Schema({ DOMAIN: vol.Schema({ vol.Exclusive(CONF_URL, DOMAIN): cv.string, diff --git a/homeassistant/components/mythicbeastsdns.py b/homeassistant/components/mythicbeastsdns.py index ff45fc8a530..d73e4619c78 100644 --- a/homeassistant/components/mythicbeastsdns.py +++ b/homeassistant/components/mythicbeastsdns.py @@ -9,7 +9,8 @@ import logging import voluptuous as vol import homeassistant.helpers.config_validation as cv -from homeassistant.const import CONF_HOST, CONF_DOMAIN, CONF_PASSWORD +from homeassistant.const import CONF_HOST, CONF_DOMAIN, CONF_PASSWORD, \ + CONF_UPDATE_INTERVAL from homeassistant.helpers.event import async_track_time_interval from homeassistant.helpers.aiohttp_client import async_get_clientsession @@ -21,8 +22,6 @@ DOMAIN = 'mythicbeastsdns' DEFAULT_INTERVAL = timedelta(minutes=10) -CONF_UPDATE_INTERVAL = 'update_interval' - CONFIG_SCHEMA = vol.Schema({ DOMAIN: vol.Schema({ vol.Required(CONF_HOST): cv.string, diff --git a/homeassistant/components/sensor/broadlink.py b/homeassistant/components/sensor/broadlink.py index 21e5b0ee1d9..50f9f955148 100644 --- a/homeassistant/components/sensor/broadlink.py +++ b/homeassistant/components/sensor/broadlink.py @@ -14,7 +14,7 @@ import voluptuous as vol from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( CONF_HOST, CONF_MAC, CONF_MONITORED_CONDITIONS, CONF_NAME, TEMP_CELSIUS, - CONF_TIMEOUT) + CONF_TIMEOUT, CONF_UPDATE_INTERVAL) from homeassistant.helpers.entity import Entity from homeassistant.util import Throttle import homeassistant.helpers.config_validation as cv @@ -23,7 +23,6 @@ REQUIREMENTS = ['broadlink==0.9.0'] _LOGGER = logging.getLogger(__name__) -CONF_UPDATE_INTERVAL = 'update_interval' DEVICE_DEFAULT_NAME = 'Broadlink sensor' DEFAULT_TIMEOUT = 10 diff --git a/homeassistant/components/sensor/darksky.py b/homeassistant/components/sensor/darksky.py index 06232baca4e..28a51bd8ef2 100644 --- a/homeassistant/components/sensor/darksky.py +++ b/homeassistant/components/sensor/darksky.py @@ -14,7 +14,7 @@ import voluptuous as vol from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( ATTR_ATTRIBUTION, CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, - CONF_MONITORED_CONDITIONS, CONF_NAME, UNIT_UV_INDEX) + CONF_MONITORED_CONDITIONS, CONF_NAME, UNIT_UV_INDEX, CONF_UPDATE_INTERVAL) import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity from homeassistant.util import Throttle @@ -28,7 +28,6 @@ ATTRIBUTION = "Powered by Dark Sky" CONF_FORECAST = 'forecast' CONF_LANGUAGE = 'language' CONF_UNITS = 'units' -CONF_UPDATE_INTERVAL = 'update_interval' DEFAULT_LANGUAGE = 'en' diff --git a/homeassistant/components/sensor/fedex.py b/homeassistant/components/sensor/fedex.py index 7d5f47b3631..02938ff837b 100644 --- a/homeassistant/components/sensor/fedex.py +++ b/homeassistant/components/sensor/fedex.py @@ -12,7 +12,7 @@ import voluptuous as vol from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import (CONF_NAME, CONF_USERNAME, CONF_PASSWORD, - ATTR_ATTRIBUTION) + ATTR_ATTRIBUTION, CONF_UPDATE_INTERVAL) from homeassistant.helpers.entity import Entity from homeassistant.util import slugify from homeassistant.util import Throttle @@ -23,7 +23,6 @@ REQUIREMENTS = ['fedexdeliverymanager==1.0.6'] _LOGGER = logging.getLogger(__name__) -CONF_UPDATE_INTERVAL = 'update_interval' COOKIE = 'fedexdeliverymanager_cookies.pickle' DOMAIN = 'fedex' diff --git a/homeassistant/components/sensor/magicseaweed.py b/homeassistant/components/sensor/magicseaweed.py index e14af6c3392..0500597b96a 100644 --- a/homeassistant/components/sensor/magicseaweed.py +++ b/homeassistant/components/sensor/magicseaweed.py @@ -23,7 +23,6 @@ _LOGGER = logging.getLogger(__name__) CONF_HOURS = 'hours' CONF_SPOT_ID = 'spot_id' CONF_UNITS = 'units' -CONF_UPDATE_INTERVAL = 'update_interval' DEFAULT_UNIT = 'us' DEFAULT_NAME = 'MSW' diff --git a/homeassistant/components/sensor/ups.py b/homeassistant/components/sensor/ups.py index aa6ce930619..44ecdc433c5 100644 --- a/homeassistant/components/sensor/ups.py +++ b/homeassistant/components/sensor/ups.py @@ -12,7 +12,7 @@ import voluptuous as vol from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import (CONF_NAME, CONF_USERNAME, CONF_PASSWORD, - ATTR_ATTRIBUTION) + ATTR_ATTRIBUTION, CONF_UPDATE_INTERVAL) from homeassistant.helpers.entity import Entity from homeassistant.util import slugify from homeassistant.util import Throttle @@ -25,7 +25,6 @@ _LOGGER = logging.getLogger(__name__) DOMAIN = 'ups' COOKIE = 'upsmychoice_cookies.pickle' -CONF_UPDATE_INTERVAL = 'update_interval' ICON = 'mdi:package-variant-closed' STATUS_DELIVERED = 'delivered' diff --git a/homeassistant/components/tellduslive/__init__.py b/homeassistant/components/tellduslive/__init__.py index 472ba3d36f3..d9cd1be59da 100644 --- a/homeassistant/components/tellduslive/__init__.py +++ b/homeassistant/components/tellduslive/__init__.py @@ -13,12 +13,13 @@ import voluptuous as vol from homeassistant import config_entries import homeassistant.helpers.config_validation as cv +from homeassistant.const import CONF_UPDATE_INTERVAL from homeassistant.helpers.dispatcher import async_dispatcher_send from homeassistant.helpers.event import async_track_time_interval from . import config_flow # noqa pylint_disable=unused-import from .const import ( - CONF_HOST, CONF_UPDATE_INTERVAL, DOMAIN, KEY_HOST, KEY_SCAN_INTERVAL, + CONF_HOST, DOMAIN, KEY_HOST, KEY_SCAN_INTERVAL, KEY_SESSION, MIN_UPDATE_INTERVAL, NOT_SO_PRIVATE_KEY, PUBLIC_KEY, SCAN_INTERVAL, SIGNAL_UPDATE_ENTITY, TELLDUS_DISCOVERY_NEW) diff --git a/homeassistant/components/tellduslive/const.py b/homeassistant/components/tellduslive/const.py index 81b3abefdee..80b0513b763 100644 --- a/homeassistant/components/tellduslive/const.py +++ b/homeassistant/components/tellduslive/const.py @@ -18,7 +18,6 @@ KEY_SESSION = 'session' KEY_SCAN_INTERVAL = 'scan_interval' CONF_TOKEN_SECRET = 'token_secret' -CONF_UPDATE_INTERVAL = 'update_interval' PUBLIC_KEY = 'THUPUNECH5YEQA3RE6UYUPRUZ2DUGUGA' NOT_SO_PRIVATE_KEY = 'PHES7U2RADREWAFEBUSTUBAWRASWUTUS' diff --git a/homeassistant/components/volvooncall.py b/homeassistant/components/volvooncall.py index ce4dccbaf75..0d89537b8e8 100644 --- a/homeassistant/components/volvooncall.py +++ b/homeassistant/components/volvooncall.py @@ -10,7 +10,8 @@ import logging import voluptuous as vol from homeassistant.const import (CONF_USERNAME, CONF_PASSWORD, - CONF_NAME, CONF_RESOURCES) + CONF_NAME, CONF_RESOURCES, + CONF_UPDATE_INTERVAL) from homeassistant.helpers import discovery import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity @@ -32,7 +33,6 @@ _LOGGER = logging.getLogger(__name__) MIN_UPDATE_INTERVAL = timedelta(minutes=1) DEFAULT_UPDATE_INTERVAL = timedelta(minutes=1) -CONF_UPDATE_INTERVAL = 'update_interval' CONF_REGION = 'region' CONF_SERVICE_URL = 'service_url' CONF_SCANDINAVIAN_MILES = 'scandinavian_miles' diff --git a/homeassistant/const.py b/homeassistant/const.py index da9c32dee41..8701c682920 100644 --- a/homeassistant/const.py +++ b/homeassistant/const.py @@ -147,6 +147,7 @@ CONF_TTL = 'ttl' CONF_TYPE = 'type' CONF_UNIT_OF_MEASUREMENT = 'unit_of_measurement' CONF_UNIT_SYSTEM = 'unit_system' +CONF_UPDATE_INTERVAL = 'update_interval' CONF_URL = 'url' CONF_USERNAME = 'username' CONF_VALUE_TEMPLATE = 'value_template'