From 6d94c121a7c401fc475c9264dcea3d8da24e9008 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Oct 2017 13:31:12 +0100 Subject: [PATCH] Move constant to 'const.py' (#10249) --- homeassistant/components/sensor/hddtemp.py | 12 ++++-------- homeassistant/components/sensor/synologydsm.py | 3 +-- homeassistant/const.py | 3 ++- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/homeassistant/components/sensor/hddtemp.py b/homeassistant/components/sensor/hddtemp.py index af4b1e61138..e025cd2fbcd 100644 --- a/homeassistant/components/sensor/hddtemp.py +++ b/homeassistant/components/sensor/hddtemp.py @@ -11,19 +11,16 @@ from telnetlib import Telnet import voluptuous as vol import homeassistant.helpers.config_validation as cv -from homeassistant.helpers.entity import Entity from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( - CONF_NAME, CONF_HOST, CONF_PORT, TEMP_CELSIUS, TEMP_FAHRENHEIT, - STATE_UNKNOWN) + CONF_NAME, CONF_HOST, CONF_PORT, TEMP_CELSIUS, TEMP_FAHRENHEIT, CONF_DISKS) +from homeassistant.helpers.entity import Entity _LOGGER = logging.getLogger(__name__) ATTR_DEVICE = 'device' ATTR_MODEL = 'model' -CONF_DISKS = 'disks' - DEFAULT_HOST = 'localhost' DEFAULT_PORT = 7634 DEFAULT_NAME = 'HD Temperature' @@ -32,8 +29,7 @@ DEFAULT_TIMEOUT = 5 SCAN_INTERVAL = timedelta(minutes=1) PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ - vol.Optional(CONF_DISKS, default=[]): - vol.All(cv.ensure_list, [cv.string]), + vol.Optional(CONF_DISKS, default=[]): vol.All(cv.ensure_list, [cv.string]), vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string, vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port, vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, @@ -108,7 +104,7 @@ class HddTempSensor(Entity): self._details = self.hddtemp.data[self.disk].split('|') self._state = self._details[2] else: - self._state = STATE_UNKNOWN + self._state = None class HddTempData(object): diff --git a/homeassistant/components/sensor/synologydsm.py b/homeassistant/components/sensor/synologydsm.py index 20d93a4abc0..cfc868de664 100644 --- a/homeassistant/components/sensor/synologydsm.py +++ b/homeassistant/components/sensor/synologydsm.py @@ -13,7 +13,7 @@ import homeassistant.helpers.config_validation as cv from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( CONF_HOST, CONF_USERNAME, CONF_PASSWORD, CONF_PORT, TEMP_CELSIUS, - CONF_MONITORED_CONDITIONS, EVENT_HOMEASSISTANT_START) + CONF_MONITORED_CONDITIONS, EVENT_HOMEASSISTANT_START, CONF_DISKS) from homeassistant.helpers.entity import Entity from homeassistant.util import Throttle @@ -21,7 +21,6 @@ REQUIREMENTS = ['python-synology==0.1.0'] _LOGGER = logging.getLogger(__name__) -CONF_DISKS = 'disks' CONF_VOLUMES = 'volumes' DEFAULT_NAME = 'Synology DSM' DEFAULT_PORT = 5000 diff --git a/homeassistant/const.py b/homeassistant/const.py index 0ebb8d16bd3..aef543e3666 100644 --- a/homeassistant/const.py +++ b/homeassistant/const.py @@ -88,8 +88,9 @@ CONF_DEVICE_CLASS = 'device_class' CONF_DEVICES = 'devices' CONF_DISARM_AFTER_TRIGGER = 'disarm_after_trigger' CONF_DISCOVERY = 'discovery' -CONF_DISPLAY_OPTIONS = 'display_options' +CONF_DISKS = 'disks' CONF_DISPLAY_CURRENCY = 'display_currency' +CONF_DISPLAY_OPTIONS = 'display_options' CONF_DOMAIN = 'domain' CONF_DOMAINS = 'domains' CONF_EFFECT = 'effect'