diff --git a/homeassistant/components/yweather/sensor.py b/homeassistant/components/yweather/sensor.py index 4dc23699872..c7f752a8836 100644 --- a/homeassistant/components/yweather/sensor.py +++ b/homeassistant/components/yweather/sensor.py @@ -1,17 +1,23 @@ """Support for the Yahoo! Weather service.""" -import logging from datetime import timedelta +import logging import voluptuous as vol +from yahooweather import ( # pylint: disable=import-error + UNIT_C, + UNIT_F, + YahooWeather, + get_woeid, +) -import homeassistant.helpers.config_validation as cv from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.const import ( - TEMP_CELSIUS, + ATTR_ATTRIBUTION, CONF_MONITORED_CONDITIONS, CONF_NAME, - ATTR_ATTRIBUTION, + TEMP_CELSIUS, ) +import homeassistant.helpers.config_validation as cv from homeassistant.helpers.entity import Entity from homeassistant.util import Throttle @@ -20,6 +26,7 @@ _LOGGER = logging.getLogger(__name__) ATTRIBUTION = "Weather details provided by Yahoo! Inc." CONF_FORECAST = "forecast" + CONF_WOEID = "woeid" DEFAULT_NAME = "Yweather" @@ -52,8 +59,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( def setup_platform(hass, config, add_entities, discovery_info=None): """Set up the Yahoo! weather sensor.""" - from yahooweather import get_woeid, UNIT_C, UNIT_F - unit = hass.config.units.temperature_unit woeid = config.get(CONF_WOEID) forecast = config.get(CONF_FORECAST) @@ -181,8 +186,6 @@ class YahooWeatherData: def __init__(self, woeid, temp_unit): """Initialize the data object.""" - from yahooweather import YahooWeather - self._yahoo = YahooWeather(woeid, temp_unit) @property diff --git a/homeassistant/components/yweather/weather.py b/homeassistant/components/yweather/weather.py index 6779fd1896d..202124aa340 100644 --- a/homeassistant/components/yweather/weather.py +++ b/homeassistant/components/yweather/weather.py @@ -3,6 +3,12 @@ from datetime import timedelta import logging import voluptuous as vol +from yahooweather import ( # pylint: disable=import-error + UNIT_C, + UNIT_F, + YahooWeather, + get_woeid, +) from homeassistant.components.weather import ( ATTR_FORECAST_CONDITION, @@ -21,7 +27,6 @@ DATA_CONDITION = "yahoo_condition" ATTRIBUTION = "Weather details provided by Yahoo! Inc." - CONF_WOEID = "woeid" DEFAULT_NAME = "Yweather" @@ -46,7 +51,6 @@ CONDITION_CLASSES = { "exceptional": [0, 1, 2, 19, 22], } - PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( { vol.Optional(CONF_WOEID): cv.string, @@ -57,8 +61,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( def setup_platform(hass, config, add_entities, discovery_info=None): """Set up the Yahoo! weather platform.""" - from yahooweather import get_woeid, UNIT_C, UNIT_F - unit = hass.config.units.temperature_unit woeid = config.get(CONF_WOEID) name = config.get(CONF_NAME) @@ -181,8 +183,6 @@ class YahooWeatherData: def __init__(self, woeid, temp_unit): """Initialize the data object.""" - from yahooweather import YahooWeather - self._yahoo = YahooWeather(woeid, temp_unit) @property