From d9fc2a8bf6673c6aecf1fb617938878a0f214c7d Mon Sep 17 00:00:00 2001
From: Daniel Hoyer Iversen <Daniel.Hoyer.Iversen@sintef.no>
Date: Mon, 30 Nov 2015 17:00:28 +0100
Subject: [PATCH 01/18] initial version of yr.no weather component

---
 homeassistant/components/sensor/yr.py | 179 ++++++++++++++++++++++++++
 1 file changed, 179 insertions(+)
 create mode 100644 homeassistant/components/sensor/yr.py

diff --git a/homeassistant/components/sensor/yr.py b/homeassistant/components/sensor/yr.py
new file mode 100644
index 00000000000..f64f16c3f77
--- /dev/null
+++ b/homeassistant/components/sensor/yr.py
@@ -0,0 +1,179 @@
+"""
+homeassistant.components.sensor.yr
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Yr.no weather service.
+
+Configuration:
+
+Will show a symbol for the current weather as default:
+sensor:
+  platform: yr
+
+Will show temperatue and wind direction:
+sensor:
+  platform: yr
+  monitored_conditions:
+    - temperature
+    - windDirection
+
+"""
+import logging
+import datetime
+import urllib.request
+import xmltodict
+
+from homeassistant.const import ATTR_ENTITY_PICTURE
+from homeassistant.helpers.entity import Entity
+
+_LOGGER = logging.getLogger(__name__)
+
+# Sensor types are defined like so:
+SENSOR_TYPES = {
+    'symbol': ['Symbol', ''],
+    'precipitation': ['Condition', ''],
+    'temperature': ['Temperature', '°C'],
+    'windSpeed': ['Wind speed', 'm/s'],
+    'pressure': ['Pressure', 'hPa'],
+    'windDirection': ['Wind direction', '°'],
+    'humidity': ['Humidity', ''],
+    'fog': ['Fog', '%'],
+    'cloudiness': ['Cloudiness', '%'],
+    'lowClouds': ['Low clouds', '%'],
+    'mediumClouds': ['Medium clouds', '%'],
+    'highClouds': ['High clouds', '%'],
+    'dewpointTemperature': ['Dewpoint temperature', '°C'],
+}
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """ Get the yr.no sensor. """
+
+    if None in (hass.config.latitude, hass.config.longitude):
+        _LOGGER.error("Latitude or longitude not set in Home Assistant config")
+        return False
+
+    from astral import Location, GoogleGeocoder
+
+    location = Location(('', '', hass.config.latitude, hass.config.longitude,
+                         hass.config.time_zone, 0))
+
+    google = GoogleGeocoder()
+    try:
+        google._get_elevation(location)  # pylint: disable=protected-access
+        _LOGGER.info(
+            'Retrieved elevation from Google: %s', location.elevation)
+        elevation = location.elevation
+    except urllib.error.URLError:
+        # If no internet connection available etc.
+        elevation = 0
+
+    coordinates = dict(lat=hass.config.latitude,
+                       lon=hass.config.longitude, msl=elevation)
+
+    dev = []
+    if 'monitored_conditions' in config:
+        for variable in config['monitored_conditions']:
+            if variable not in SENSOR_TYPES:
+                _LOGGER.error('Sensor type: "%s" does not exist', variable)
+            else:
+                dev.append(YrSensor(coordinates, variable))
+
+    if len(dev) == 0:
+        dev.append(YrSensor(coordinates, "symbol"))
+    add_devices(dev)
+
+
+# pylint: disable=too-many-instance-attributes
+class YrSensor(Entity):
+    """ Implements an Yr.no sensor. """
+
+    def __init__(self, coordinates, sensor_type):
+        self.client_name = ''
+        self._name = SENSOR_TYPES[sensor_type][0]
+        self.type = sensor_type
+        self._state = None
+        self._weather_data = None
+
+        self._unit_of_measurement = SENSOR_TYPES[self.type][1]
+        self._nextrun = datetime.datetime.fromtimestamp(0)
+        self._url = 'http://api.yr.no/weatherapi/locationforecast/1.9/?' \
+            'lat={lat};lon={lon};msl={msl}'.format(**coordinates)
+
+        self.update()
+
+    @property
+    def name(self):
+        return '{} {}'.format(self.client_name, self._name)
+
+    @property
+    def state(self):
+        """ Returns the state of the device. """
+        return self._state
+
+    @property
+    def state_attributes(self):
+        """ Returns state attributes. """
+        data = {}
+        data[''] = "Weather forecast from yr.no, delivered by the"\
+            " Norwegian Meteorological Institute and the NRK"
+        if self.type == 'symbol':
+            symbol_nr = self._state
+            data[ATTR_ENTITY_PICTURE] = "http://api.met.no/weatherapi/weathericon/1.1/" \
+                                        "?symbol=" + str(symbol_nr) + \
+                                        ";content_type=image/png"
+        return data
+
+    @property
+    def unit_of_measurement(self):
+        """ Unit of measurement of this entity, if any. """
+        return self._unit_of_measurement
+
+    # pylint: disable=too-many-branches
+    def update(self):
+        """ Gets the latest data from yr.no and updates the states. """
+        if datetime.datetime.now() > self._nextrun:
+            try:
+                response = urllib.request.urlopen(self._url)
+            except urllib.error.URLError:
+                return
+            if response.status != 200:
+                return
+            _data = response.read().decode('utf-8')
+            self._weather_data = xmltodict.parse(_data)['weatherdata']
+            model = self._weather_data['meta']['model']
+            if '@nextrun' not in model:
+                model = model[0]
+            self._nextrun = datetime.datetime.strptime(model['@nextrun'],
+                                                       "%Y-%m-%dT%H:%M:%SZ")
+            time_data = self._weather_data['product']['time']
+
+            for k in range(len(self._weather_data['product']['time'])):
+                temp_data = time_data[k]['location']
+                if self.type in temp_data:
+                    if self.type == 'precipitation':
+                        self._state = temp_data[self.type]['@value']
+                    elif self.type == 'temperature':
+                        self._state = temp_data[self.type]['@value']
+                    elif self.type == 'windSpeed':
+                        self._state = temp_data[self.type]['@mps']
+                    elif self.type == 'pressure':
+                        self._state = temp_data[self.type]['@value']
+                    elif self.type == 'windDirection':
+                        self._state = float(temp_data[self.type]['@deg'])
+                    elif self.type == 'humidity':
+                        self._state = temp_data[self.type]['@value']
+                    elif self.type == 'fog':
+                        self._state = temp_data[self.type]['@percent']
+                    elif self.type == 'cloudiness':
+                        self._state = temp_data[self.type]['@percent']
+                    elif self.type == 'lowClouds':
+                        self._state = temp_data[self.type]['@percent']
+                    elif self.type == 'mediumClouds':
+                        self._state = temp_data[self.type]['@percent']
+                    elif self.type == 'highClouds':
+                        self._state = temp_data[self.type]['@percent']
+                    elif self.type == 'dewpointTemperature':
+                        self._state = temp_data[self.type]['@value']
+                    elif self.type == 'symbol':
+                        self._state = temp_data[self.type]['@number']
+                    return

From f912daf4b21265d289a68210ab492007863cfe79 Mon Sep 17 00:00:00 2001
From: Daniel Hoyer Iversen <Daniel.Hoyer.Iversen@sintef.no>
Date: Tue, 1 Dec 2015 12:46:08 +0100
Subject: [PATCH 02/18] Updated yr sensor

---
 homeassistant/components/sensor/yr.py | 72 ++++++++++++++++++++++-----
 1 file changed, 60 insertions(+), 12 deletions(-)

diff --git a/homeassistant/components/sensor/yr.py b/homeassistant/components/sensor/yr.py
index f64f16c3f77..98102fdb565 100644
--- a/homeassistant/components/sensor/yr.py
+++ b/homeassistant/components/sensor/yr.py
@@ -16,6 +16,24 @@ sensor:
     - temperature
     - windDirection
 
+Will show all available sensors:
+sensor:
+  platform: yr
+  monitored_conditions:
+    - temperature
+    - symbol
+    - precipitation
+    - windSpeed
+    - pressure
+    - windDirection
+    - humidity
+    - fog
+    - cloudiness
+    - lowClouds
+    - mediumClouds
+    - highClouds
+    - dewpointTemperature
+
 """
 import logging
 import datetime
@@ -93,9 +111,10 @@ class YrSensor(Entity):
         self.type = sensor_type
         self._state = None
         self._weather_data = None
-
+        self._info = ''
         self._unit_of_measurement = SENSOR_TYPES[self.type][1]
         self._nextrun = datetime.datetime.fromtimestamp(0)
+        self._update = datetime.datetime.fromtimestamp(0)
         self._url = 'http://api.yr.no/weatherapi/locationforecast/1.9/?' \
             'lat={lat};lon={lon};msl={msl}'.format(**coordinates)
 
@@ -114,7 +133,7 @@ class YrSensor(Entity):
     def state_attributes(self):
         """ Returns state attributes. """
         data = {}
-        data[''] = "Weather forecast from yr.no, delivered by the"\
+        data[''] = self._info + "Weather forecast from yr.no, delivered by the"\
             " Norwegian Meteorological Institute and the NRK"
         if self.type == 'symbol':
             symbol_nr = self._state
@@ -128,52 +147,81 @@ class YrSensor(Entity):
         """ Unit of measurement of this entity, if any. """
         return self._unit_of_measurement
 
-    # pylint: disable=too-many-branches
+    @property
+    def should_poll(self):
+        """ Return True if entity has to be polled for state. """
+        return True
+
+    # pylint: disable=too-many-branches, too-many-return-statements
     def update(self):
         """ Gets the latest data from yr.no and updates the states. """
-        if datetime.datetime.now() > self._nextrun:
+        now = datetime.datetime.now()
+        if now > self._nextrun:
             try:
                 response = urllib.request.urlopen(self._url)
             except urllib.error.URLError:
                 return
             if response.status != 200:
                 return
-            _data = response.read().decode('utf-8')
-            self._weather_data = xmltodict.parse(_data)['weatherdata']
+            data = response.read().decode('utf-8')
+            self._weather_data = xmltodict.parse(data)['weatherdata']
             model = self._weather_data['meta']['model']
             if '@nextrun' not in model:
                 model = model[0]
             self._nextrun = datetime.datetime.strptime(model['@nextrun'],
                                                        "%Y-%m-%dT%H:%M:%SZ")
+
+        if now > self._update:
             time_data = self._weather_data['product']['time']
 
-            for k in range(len(self._weather_data['product']['time'])):
+            # pylint: disable=consider-using-enumerate
+            for k in range(len(time_data)):
+                valid_from = datetime.datetime.strptime(time_data[k]['@from'],
+                                                        "%Y-%m-%dT%H:%M:%SZ")
+                valid_to = datetime.datetime.strptime(time_data[k]['@to'],
+                                                      "%Y-%m-%dT%H:%M:%SZ")
+                self._update = valid_to
+                self._info = "Forecast between " + time_data[k]['@from'] \
+                    + " and " + time_data[k]['@to'] + ". "
+
                 temp_data = time_data[k]['location']
-                if self.type in temp_data:
-                    if self.type == 'precipitation':
+                if self.type in temp_data and now < valid_to:
+                    if self.type == 'precipitation' and valid_from < now:
                         self._state = temp_data[self.type]['@value']
+                        return
+                    elif self.type == 'symbol' and valid_from < now:
+                        self._state = temp_data[self.type]['@number']
+                        return
                     elif self.type == 'temperature':
                         self._state = temp_data[self.type]['@value']
+                        return
                     elif self.type == 'windSpeed':
                         self._state = temp_data[self.type]['@mps']
+                        return
                     elif self.type == 'pressure':
                         self._state = temp_data[self.type]['@value']
+                        return
                     elif self.type == 'windDirection':
                         self._state = float(temp_data[self.type]['@deg'])
+                        return
                     elif self.type == 'humidity':
                         self._state = temp_data[self.type]['@value']
+                        return
                     elif self.type == 'fog':
                         self._state = temp_data[self.type]['@percent']
+                        return
                     elif self.type == 'cloudiness':
                         self._state = temp_data[self.type]['@percent']
+                        return
                     elif self.type == 'lowClouds':
                         self._state = temp_data[self.type]['@percent']
+                        return
                     elif self.type == 'mediumClouds':
                         self._state = temp_data[self.type]['@percent']
+                        return
                     elif self.type == 'highClouds':
                         self._state = temp_data[self.type]['@percent']
+                        return
                     elif self.type == 'dewpointTemperature':
                         self._state = temp_data[self.type]['@value']
-                    elif self.type == 'symbol':
-                        self._state = temp_data[self.type]['@number']
-                    return
+                        return

From 72d7e6e9ddb0597415c43ed75a705a46249f304c Mon Sep 17 00:00:00 2001
From: Daniel Hoyer Iversen <Daniel.Hoyer.Iversen@sintef.no>
Date: Tue, 1 Dec 2015 12:57:08 +0100
Subject: [PATCH 03/18] Added requirements to yr sensor

---
 homeassistant/components/sensor/yr.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/homeassistant/components/sensor/yr.py b/homeassistant/components/sensor/yr.py
index 98102fdb565..d5fa9490064 100644
--- a/homeassistant/components/sensor/yr.py
+++ b/homeassistant/components/sensor/yr.py
@@ -45,6 +45,9 @@ from homeassistant.helpers.entity import Entity
 
 _LOGGER = logging.getLogger(__name__)
 
+
+REQUIREMENTS = ['xmltodict']
+
 # Sensor types are defined like so:
 SENSOR_TYPES = {
     'symbol': ['Symbol', ''],

From 2dc9bc98f787e38f3daa3c3d4b4077e9753a2358 Mon Sep 17 00:00:00 2001
From: Daniel Hoyer Iversen <Daniel.Hoyer.Iversen@sintef.no>
Date: Tue, 1 Dec 2015 13:24:03 +0100
Subject: [PATCH 04/18] Tests for yr sensor

---
 tests/components/sensor/test_yr.py | 72 ++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 tests/components/sensor/test_yr.py

diff --git a/tests/components/sensor/test_yr.py b/tests/components/sensor/test_yr.py
new file mode 100644
index 00000000000..971d7890454
--- /dev/null
+++ b/tests/components/sensor/test_yr.py
@@ -0,0 +1,72 @@
+"""
+tests.components.sensor.test_yr
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Tests Yr sensor.
+"""
+import unittest
+
+import homeassistant.core as ha
+import homeassistant.components.sensor as sensor
+
+
+
+class TestSensorYr(unittest.TestCase):
+    """ Test the Yr sensor. """
+
+    def setUp(self):  # pylint: disable=invalid-name
+        self.hass = ha.HomeAssistant()
+        latitude = 32.87336
+        longitude = 117.22743
+
+        # Compare it with the real data
+        self.hass.config.latitude = latitude
+        self.hass.config.longitude = longitude
+
+    def tearDown(self):  # pylint: disable=invalid-name
+        """ Stop down stuff we started. """
+        self.hass.stop()
+
+    def test_default_setup(self):
+        self.assertTrue(sensor.setup(self.hass, {
+            'sensor': {
+                'platform': 'yr',
+            }
+        }))
+        state = self.hass.states.get('sensor.yr_symbol')
+
+        self.assertTrue(state.state.isnumeric())
+        self.assertEqual(None,
+                         state.attributes.get('unit_of_measurement'))
+
+
+    def test_default_setup(self):
+        self.assertTrue(sensor.setup(self.hass, {
+            'sensor': {
+                'platform': 'yr',
+                'monitored_conditions': {'pressure', 'windDirection', 'humidity', 'fog', 'windSpeed'}
+            }
+        }))
+        state = self.hass.states.get('sensor.yr_symbol')
+        self.assertEqual(None,state)
+
+        state = self.hass.states.get('sensor.yr_pressure')
+        self.assertEqual('hPa',
+                         state.attributes.get('unit_of_measurement'))
+
+        state = self.hass.states.get('sensor.yr_wind_direction')
+        self.assertEqual('°',
+                         state.attributes.get('unit_of_measurement'))
+
+        state = self.hass.states.get('sensor.yr_humidity')
+        self.assertEqual(None,
+                         state.attributes.get('unit_of_measurement'))
+
+        state = self.hass.states.get('sensor.yr_fog')
+        self.assertEqual('%',
+                         state.attributes.get('unit_of_measurement'))
+
+        state = self.hass.states.get('sensor.yr_wind_speed')
+        self.assertEqual('m/s',
+                         state.attributes.get('unit_of_measurement'))
+

From 2872c89f0cbbb874199fa4b4e215e3523496c3ec Mon Sep 17 00:00:00 2001
From: Daniel Hoyer Iversen <Daniel.Hoyer.Iversen@sintef.no>
Date: Tue, 1 Dec 2015 13:24:32 +0100
Subject: [PATCH 05/18] Fix in yr sensor

---
 homeassistant/components/sensor/yr.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/sensor/yr.py b/homeassistant/components/sensor/yr.py
index d5fa9490064..803fd60800d 100644
--- a/homeassistant/components/sensor/yr.py
+++ b/homeassistant/components/sensor/yr.py
@@ -38,7 +38,6 @@ sensor:
 import logging
 import datetime
 import urllib.request
-import xmltodict
 
 from homeassistant.const import ATTR_ENTITY_PICTURE
 from homeassistant.helpers.entity import Entity
@@ -46,7 +45,8 @@ from homeassistant.helpers.entity import Entity
 _LOGGER = logging.getLogger(__name__)
 
 
-REQUIREMENTS = ['xmltodict']
+REQUIREMENTS = ['xmltodict', 'astral==0.8.1']
+
 
 # Sensor types are defined like so:
 SENSOR_TYPES = {
@@ -74,7 +74,6 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         return False
 
     from astral import Location, GoogleGeocoder
-
     location = Location(('', '', hass.config.latitude, hass.config.longitude,
                          hass.config.time_zone, 0))
 
@@ -109,7 +108,7 @@ class YrSensor(Entity):
     """ Implements an Yr.no sensor. """
 
     def __init__(self, coordinates, sensor_type):
-        self.client_name = ''
+        self.client_name = 'yr'
         self._name = SENSOR_TYPES[sensor_type][0]
         self.type = sensor_type
         self._state = None
@@ -167,6 +166,7 @@ class YrSensor(Entity):
             if response.status != 200:
                 return
             data = response.read().decode('utf-8')
+            import xmltodict
             self._weather_data = xmltodict.parse(data)['weatherdata']
             model = self._weather_data['meta']['model']
             if '@nextrun' not in model:

From ff15fea9f80283e34564357004b6e7d17ef07475 Mon Sep 17 00:00:00 2001
From: Daniel Hoyer Iversen <Daniel.Hoyer.Iversen@sintef.no>
Date: Tue, 1 Dec 2015 13:31:55 +0100
Subject: [PATCH 06/18] Added units to sensor yr

---
 homeassistant/components/sensor/yr.py | 4 ++--
 tests/components/sensor/test_yr.py    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/sensor/yr.py b/homeassistant/components/sensor/yr.py
index 803fd60800d..c2b0e138857 100644
--- a/homeassistant/components/sensor/yr.py
+++ b/homeassistant/components/sensor/yr.py
@@ -51,12 +51,12 @@ REQUIREMENTS = ['xmltodict', 'astral==0.8.1']
 # Sensor types are defined like so:
 SENSOR_TYPES = {
     'symbol': ['Symbol', ''],
-    'precipitation': ['Condition', ''],
+    'precipitation': ['Condition', 'mm'],
     'temperature': ['Temperature', '°C'],
     'windSpeed': ['Wind speed', 'm/s'],
     'pressure': ['Pressure', 'hPa'],
     'windDirection': ['Wind direction', '°'],
-    'humidity': ['Humidity', ''],
+    'humidity': ['Humidity', '%'],
     'fog': ['Fog', '%'],
     'cloudiness': ['Cloudiness', '%'],
     'lowClouds': ['Low clouds', '%'],
diff --git a/tests/components/sensor/test_yr.py b/tests/components/sensor/test_yr.py
index 971d7890454..2f8d4ea838f 100644
--- a/tests/components/sensor/test_yr.py
+++ b/tests/components/sensor/test_yr.py
@@ -59,7 +59,7 @@ class TestSensorYr(unittest.TestCase):
                          state.attributes.get('unit_of_measurement'))
 
         state = self.hass.states.get('sensor.yr_humidity')
-        self.assertEqual(None,
+        self.assertEqual('%',
                          state.attributes.get('unit_of_measurement'))
 
         state = self.hass.states.get('sensor.yr_fog')

From 618ebfe43cbd274be2795b293feab0f68dced51c Mon Sep 17 00:00:00 2001
From: Daniel Hoyer Iversen <Daniel.Hoyer.Iversen@sintef.no>
Date: Tue, 1 Dec 2015 13:40:26 +0100
Subject: [PATCH 07/18] try to fix requirements for yr sensor

---
 homeassistant/components/sensor/yr.py | 3 ++-
 requirements_all.txt                  | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/sensor/yr.py b/homeassistant/components/sensor/yr.py
index c2b0e138857..4c728a5a5b2 100644
--- a/homeassistant/components/sensor/yr.py
+++ b/homeassistant/components/sensor/yr.py
@@ -38,6 +38,7 @@ sensor:
 import logging
 import datetime
 import urllib.request
+import xmltodict
 
 from homeassistant.const import ATTR_ENTITY_PICTURE
 from homeassistant.helpers.entity import Entity
@@ -166,7 +167,7 @@ class YrSensor(Entity):
             if response.status != 200:
                 return
             data = response.read().decode('utf-8')
-            import xmltodict
+
             self._weather_data = xmltodict.parse(data)['weatherdata']
             model = self._weather_data['meta']['model']
             if '@nextrun' not in model:
diff --git a/requirements_all.txt b/requirements_all.txt
index 1ff81bcc64a..4c046c61f11 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -170,3 +170,6 @@ https://github.com/persandstrom/python-verisure/archive/9873c4527f01b1ba1f72ae60
 
 # homeassistant.components.zwave
 pydispatcher==2.0.5
+
+# homeassistant.components.sensor.yr
+xmltodict

From 15770ff90f9233628dad26c2bf5582419fb72bde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yer=20Iversen?= <daniel.h.iversen@ntnu.no>
Date: Tue, 1 Dec 2015 20:12:07 +0100
Subject: [PATCH 08/18] Update yr.py

---
 homeassistant/components/sensor/yr.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/sensor/yr.py b/homeassistant/components/sensor/yr.py
index 4c728a5a5b2..b2da0d7053a 100644
--- a/homeassistant/components/sensor/yr.py
+++ b/homeassistant/components/sensor/yr.py
@@ -37,6 +37,7 @@ sensor:
 """
 import logging
 import datetime
+import homeassistant.util.dt as dt_util
 import urllib.request
 import xmltodict
 
@@ -158,7 +159,7 @@ class YrSensor(Entity):
     # pylint: disable=too-many-branches, too-many-return-statements
     def update(self):
         """ Gets the latest data from yr.no and updates the states. """
-        now = datetime.datetime.now()
+        now = dt_util.utcnow()
         if now > self._nextrun:
             try:
                 response = urllib.request.urlopen(self._url)

From e68a8f9c0f126c4fa82821e8c26f6f06c012f0d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yer=20Iversen?= <daniel.h.iversen@ntnu.no>
Date: Tue, 1 Dec 2015 20:16:04 +0100
Subject: [PATCH 09/18] Update yr.py

---
 homeassistant/components/sensor/yr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/sensor/yr.py b/homeassistant/components/sensor/yr.py
index b2da0d7053a..3f6a7cf7fda 100644
--- a/homeassistant/components/sensor/yr.py
+++ b/homeassistant/components/sensor/yr.py
@@ -35,9 +35,9 @@ sensor:
     - dewpointTemperature
 
 """
+import homeassistant.util.dt as dt_util
 import logging
 import datetime
-import homeassistant.util.dt as dt_util
 import urllib.request
 import xmltodict
 

From 361ab0f92b113c0d0b9e5e4be902a855b7ddb764 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yer=20Iversen?= <daniel.h.iversen@ntnu.no>
Date: Tue, 1 Dec 2015 20:19:59 +0100
Subject: [PATCH 10/18] Update yr.py

---
 homeassistant/components/sensor/yr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/sensor/yr.py b/homeassistant/components/sensor/yr.py
index 3f6a7cf7fda..7eef61c5136 100644
--- a/homeassistant/components/sensor/yr.py
+++ b/homeassistant/components/sensor/yr.py
@@ -35,11 +35,11 @@ sensor:
     - dewpointTemperature
 
 """
-import homeassistant.util.dt as dt_util
 import logging
 import datetime
 import urllib.request
 import xmltodict
+import homeassistant.util.dt as dt_util
 
 from homeassistant.const import ATTR_ENTITY_PICTURE
 from homeassistant.helpers.entity import Entity

From 31f1e1d7a47f69229dcc645b06ac3162c48808d3 Mon Sep 17 00:00:00 2001
From: Daniel Hoyer Iversen <Daniel.Hoyer.Iversen@sintef.no>
Date: Wed, 2 Dec 2015 13:04:23 +0100
Subject: [PATCH 11/18] added comment for yr sensor

---
 homeassistant/components/sensor/yr.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/sensor/yr.py b/homeassistant/components/sensor/yr.py
index 4c728a5a5b2..37d199b18d7 100644
--- a/homeassistant/components/sensor/yr.py
+++ b/homeassistant/components/sensor/yr.py
@@ -99,6 +99,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             else:
                 dev.append(YrSensor(coordinates, variable))
 
+    # add symbol as default sensor
     if len(dev) == 0:
         dev.append(YrSensor(coordinates, "symbol"))
     add_devices(dev)
@@ -159,6 +160,7 @@ class YrSensor(Entity):
     def update(self):
         """ Gets the latest data from yr.no and updates the states. """
         now = datetime.datetime.now()
+        # check if new will be available
         if now > self._nextrun:
             try:
                 response = urllib.request.urlopen(self._url)
@@ -174,11 +176,12 @@ class YrSensor(Entity):
                 model = model[0]
             self._nextrun = datetime.datetime.strptime(model['@nextrun'],
                                                        "%Y-%m-%dT%H:%M:%SZ")
-
+        # check if data should be updated
         if now > self._update:
             time_data = self._weather_data['product']['time']
 
             # pylint: disable=consider-using-enumerate
+            # find sensor
             for k in range(len(time_data)):
                 valid_from = datetime.datetime.strptime(time_data[k]['@from'],
                                                         "%Y-%m-%dT%H:%M:%SZ")

From 750ca79ac05383b85c8cb4302ed9f5700caac854 Mon Sep 17 00:00:00 2001
From: Daniel Hoyer Iversen <Daniel.Hoyer.Iversen@sintef.no>
Date: Fri, 4 Dec 2015 15:05:23 +0100
Subject: [PATCH 12/18] Refactor yr sensor

---
 homeassistant/components/sensor/yr.py | 71 +++++++++++++++++----------
 1 file changed, 45 insertions(+), 26 deletions(-)

diff --git a/homeassistant/components/sensor/yr.py b/homeassistant/components/sensor/yr.py
index 37d199b18d7..b7ba0fcbd8d 100644
--- a/homeassistant/components/sensor/yr.py
+++ b/homeassistant/components/sensor/yr.py
@@ -38,7 +38,6 @@ sensor:
 import logging
 import datetime
 import urllib.request
-import xmltodict
 
 from homeassistant.const import ATTR_ENTITY_PICTURE
 from homeassistant.helpers.entity import Entity
@@ -48,7 +47,6 @@ _LOGGER = logging.getLogger(__name__)
 
 REQUIREMENTS = ['xmltodict', 'astral==0.8.1']
 
-
 # Sensor types are defined like so:
 SENSOR_TYPES = {
     'symbol': ['Symbol', ''],
@@ -91,17 +89,19 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     coordinates = dict(lat=hass.config.latitude,
                        lon=hass.config.longitude, msl=elevation)
 
+    weather = YrData(coordinates)
+
     dev = []
     if 'monitored_conditions' in config:
         for variable in config['monitored_conditions']:
             if variable not in SENSOR_TYPES:
                 _LOGGER.error('Sensor type: "%s" does not exist', variable)
             else:
-                dev.append(YrSensor(coordinates, variable))
+                dev.append(YrSensor(variable, weather))
 
     # add symbol as default sensor
     if len(dev) == 0:
-        dev.append(YrSensor(coordinates, "symbol"))
+        dev.append(YrSensor("symbol", weather))
     add_devices(dev)
 
 
@@ -109,18 +109,15 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 class YrSensor(Entity):
     """ Implements an Yr.no sensor. """
 
-    def __init__(self, coordinates, sensor_type):
+    def __init__(self, sensor_type, weather):
         self.client_name = 'yr'
         self._name = SENSOR_TYPES[sensor_type][0]
         self.type = sensor_type
         self._state = None
-        self._weather_data = None
+        self._weather = weather
         self._info = ''
         self._unit_of_measurement = SENSOR_TYPES[self.type][1]
-        self._nextrun = datetime.datetime.fromtimestamp(0)
         self._update = datetime.datetime.fromtimestamp(0)
-        self._url = 'http://api.yr.no/weatherapi/locationforecast/1.9/?' \
-            'lat={lat};lon={lon};msl={msl}'.format(**coordinates)
 
         self.update()
 
@@ -144,6 +141,9 @@ class YrSensor(Entity):
             data[ATTR_ENTITY_PICTURE] = "http://api.met.no/weatherapi/weathericon/1.1/" \
                                         "?symbol=" + str(symbol_nr) + \
                                         ";content_type=image/png"
+            data["description_image"] = "http://api.met.no/weatherapi/weathericon/1.1/" \
+                                        "?symbol=" + str(symbol_nr) + \
+                                        ";content_type=image/png"
         return data
 
     @property
@@ -159,26 +159,12 @@ class YrSensor(Entity):
     # pylint: disable=too-many-branches, too-many-return-statements
     def update(self):
         """ Gets the latest data from yr.no and updates the states. """
-        now = datetime.datetime.now()
-        # check if new will be available
-        if now > self._nextrun:
-            try:
-                response = urllib.request.urlopen(self._url)
-            except urllib.error.URLError:
-                return
-            if response.status != 200:
-                return
-            data = response.read().decode('utf-8')
 
-            self._weather_data = xmltodict.parse(data)['weatherdata']
-            model = self._weather_data['meta']['model']
-            if '@nextrun' not in model:
-                model = model[0]
-            self._nextrun = datetime.datetime.strptime(model['@nextrun'],
-                                                       "%Y-%m-%dT%H:%M:%SZ")
+        self._weather.update()
+        now = datetime.datetime.now()
         # check if data should be updated
         if now > self._update:
-            time_data = self._weather_data['product']['time']
+            time_data = self._weather.data['product']['time']
 
             # pylint: disable=consider-using-enumerate
             # find sensor
@@ -232,3 +218,36 @@ class YrSensor(Entity):
                     elif self.type == 'dewpointTemperature':
                         self._state = temp_data[self.type]['@value']
                         return
+
+
+# pylint: disable=too-few-public-methods
+class YrData(object):
+    """ Gets the latest data and updates the states. """
+
+    def __init__(self, coordinates):
+        self._url = 'http://api.yr.no/weatherapi/locationforecast/1.9/?' \
+            'lat={lat};lon={lon};msl={msl}'.format(**coordinates)
+
+        self._nextrun = datetime.datetime.fromtimestamp(0)
+        self.update()
+
+    def update(self):
+        """ Gets the latest data from yr.no """
+        now = datetime.datetime.now()
+        # check if new will be available
+        if now > self._nextrun:
+            try:
+                response = urllib.request.urlopen(self._url)
+            except urllib.error.URLError:
+                return
+            if response.status != 200:
+                return
+            data = response.read().decode('utf-8')
+
+            import xmltodict
+            self.data = xmltodict.parse(data)['weatherdata']
+            model = self.data['meta']['model']
+            if '@nextrun' not in model:
+                model = model[0]
+            self._nextrun = datetime.datetime.strptime(model['@nextrun'],
+                                                       "%Y-%m-%dT%H:%M:%SZ")

From ac41f3028ccd8a1b80545e485dddce060971fb75 Mon Sep 17 00:00:00 2001
From: Daniel Hoyer Iversen <Daniel.Hoyer.Iversen@sintef.no>
Date: Fri, 4 Dec 2015 15:10:26 +0100
Subject: [PATCH 13/18] Refactor yr sensor

---
 homeassistant/components/sensor/yr.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/homeassistant/components/sensor/yr.py b/homeassistant/components/sensor/yr.py
index b7ba0fcbd8d..e5e7585eeef 100644
--- a/homeassistant/components/sensor/yr.py
+++ b/homeassistant/components/sensor/yr.py
@@ -141,9 +141,7 @@ class YrSensor(Entity):
             data[ATTR_ENTITY_PICTURE] = "http://api.met.no/weatherapi/weathericon/1.1/" \
                                         "?symbol=" + str(symbol_nr) + \
                                         ";content_type=image/png"
-            data["description_image"] = "http://api.met.no/weatherapi/weathericon/1.1/" \
-                                        "?symbol=" + str(symbol_nr) + \
-                                        ";content_type=image/png"
+
         return data
 
     @property

From 8e16a443e5a9714ddd9a3a8ef30e4a0e01194365 Mon Sep 17 00:00:00 2001
From: Daniel <Daniel.H.Iversen@ntnu.no>
Date: Mon, 21 Dec 2015 10:24:22 +0100
Subject: [PATCH 14/18] Added yr sensor to requirements_all

---
 requirements_all.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/requirements_all.txt b/requirements_all.txt
index 4c046c61f11..191607f551d 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -141,7 +141,11 @@ https://github.com/rkabadi/temper-python/archive/3dbdaf2d87b8db9a3cd6e5585fc7045
 # homeassistant.components.switch.transmission
 transmissionrpc==0.11
 
+# homeassistant.components.sensor.yr
+xmltodict
+
 # homeassistant.components.sun
+# homeassistant.components.sensor.yr
 astral==0.8.1
 
 # homeassistant.components.switch.edimax
@@ -170,6 +174,3 @@ https://github.com/persandstrom/python-verisure/archive/9873c4527f01b1ba1f72ae60
 
 # homeassistant.components.zwave
 pydispatcher==2.0.5
-
-# homeassistant.components.sensor.yr
-xmltodict

From 9a1883bb49b69516709082e5cb15babc61148b6e Mon Sep 17 00:00:00 2001
From: Daniel <Daniel.H.Iversen@ntnu.no>
Date: Mon, 21 Dec 2015 10:29:12 +0100
Subject: [PATCH 15/18] changed to use requestes in stead of urllib for yr
 sensor

---
 homeassistant/components/sensor/yr.py | 141 +++++++++++++-------------
 1 file changed, 73 insertions(+), 68 deletions(-)

diff --git a/homeassistant/components/sensor/yr.py b/homeassistant/components/sensor/yr.py
index e5e7585eeef..cad263b37b8 100644
--- a/homeassistant/components/sensor/yr.py
+++ b/homeassistant/components/sensor/yr.py
@@ -38,6 +38,7 @@ sensor:
 import logging
 import datetime
 import urllib.request
+import requests
 
 from homeassistant.const import ATTR_ENTITY_PICTURE
 from homeassistant.helpers.entity import Entity
@@ -161,61 +162,64 @@ class YrSensor(Entity):
         self._weather.update()
         now = datetime.datetime.now()
         # check if data should be updated
-        if now > self._update:
-            time_data = self._weather.data['product']['time']
+        if now <= self._update:
+            return
 
-            # pylint: disable=consider-using-enumerate
-            # find sensor
-            for k in range(len(time_data)):
-                valid_from = datetime.datetime.strptime(time_data[k]['@from'],
-                                                        "%Y-%m-%dT%H:%M:%SZ")
-                valid_to = datetime.datetime.strptime(time_data[k]['@to'],
-                                                      "%Y-%m-%dT%H:%M:%SZ")
-                self._update = valid_to
-                self._info = "Forecast between " + time_data[k]['@from'] \
-                    + " and " + time_data[k]['@to'] + ". "
+        time_data = self._weather.data['product']['time']
 
-                temp_data = time_data[k]['location']
-                if self.type in temp_data and now < valid_to:
-                    if self.type == 'precipitation' and valid_from < now:
-                        self._state = temp_data[self.type]['@value']
-                        return
-                    elif self.type == 'symbol' and valid_from < now:
-                        self._state = temp_data[self.type]['@number']
-                        return
-                    elif self.type == 'temperature':
-                        self._state = temp_data[self.type]['@value']
-                        return
-                    elif self.type == 'windSpeed':
-                        self._state = temp_data[self.type]['@mps']
-                        return
-                    elif self.type == 'pressure':
-                        self._state = temp_data[self.type]['@value']
-                        return
-                    elif self.type == 'windDirection':
-                        self._state = float(temp_data[self.type]['@deg'])
-                        return
-                    elif self.type == 'humidity':
-                        self._state = temp_data[self.type]['@value']
-                        return
-                    elif self.type == 'fog':
-                        self._state = temp_data[self.type]['@percent']
-                        return
-                    elif self.type == 'cloudiness':
-                        self._state = temp_data[self.type]['@percent']
-                        return
-                    elif self.type == 'lowClouds':
-                        self._state = temp_data[self.type]['@percent']
-                        return
-                    elif self.type == 'mediumClouds':
-                        self._state = temp_data[self.type]['@percent']
-                        return
-                    elif self.type == 'highClouds':
-                        self._state = temp_data[self.type]['@percent']
-                        return
-                    elif self.type == 'dewpointTemperature':
-                        self._state = temp_data[self.type]['@value']
-                        return
+        # pylint: disable=consider-using-enumerate
+        # find sensor
+        for k in range(len(time_data)):
+            valid_from = datetime.datetime.strptime(time_data[k]['@from'],
+                                                    "%Y-%m-%dT%H:%M:%SZ")
+            valid_to = datetime.datetime.strptime(time_data[k]['@to'],
+                                                  "%Y-%m-%dT%H:%M:%SZ")
+            self._update = valid_to
+            self._info = "Forecast between " + time_data[k]['@from'] \
+                + " and " + time_data[k]['@to'] + ". "
+
+            temp_data = time_data[k]['location']
+            if self.type not in temp_data and now >= valid_to:
+                continue
+            if self.type == 'precipitation' and valid_from < now:
+                self._state = temp_data[self.type]['@value']
+                return
+            elif self.type == 'symbol' and valid_from < now:
+                self._state = temp_data[self.type]['@number']
+                return
+            elif self.type == 'temperature':
+                self._state = temp_data[self.type]['@value']
+                return
+            elif self.type == 'windSpeed':
+                self._state = temp_data[self.type]['@mps']
+                return
+            elif self.type == 'pressure':
+                self._state = temp_data[self.type]['@value']
+                return
+            elif self.type == 'windDirection':
+                self._state = float(temp_data[self.type]['@deg'])
+                return
+            elif self.type == 'humidity':
+                self._state = temp_data[self.type]['@value']
+                return
+            elif self.type == 'fog':
+                self._state = temp_data[self.type]['@percent']
+                return
+            elif self.type == 'cloudiness':
+                self._state = temp_data[self.type]['@percent']
+                return
+            elif self.type == 'lowClouds':
+                self._state = temp_data[self.type]['@percent']
+                return
+            elif self.type == 'mediumClouds':
+                self._state = temp_data[self.type]['@percent']
+                return
+            elif self.type == 'highClouds':
+                self._state = temp_data[self.type]['@percent']
+                return
+            elif self.type == 'dewpointTemperature':
+                self._state = temp_data[self.type]['@value']
+                return
 
 
 # pylint: disable=too-few-public-methods
@@ -233,19 +237,20 @@ class YrData(object):
         """ Gets the latest data from yr.no """
         now = datetime.datetime.now()
         # check if new will be available
-        if now > self._nextrun:
-            try:
-                response = urllib.request.urlopen(self._url)
-            except urllib.error.URLError:
-                return
-            if response.status != 200:
-                return
-            data = response.read().decode('utf-8')
+        if now <= self._nextrun:
+            return
+        try:
+            response = requests.get(self._url)
+        except requests.RequestException:
+            return
+        if response.status_code != 200:
+            return
+        data = response.text
 
-            import xmltodict
-            self.data = xmltodict.parse(data)['weatherdata']
-            model = self.data['meta']['model']
-            if '@nextrun' not in model:
-                model = model[0]
-            self._nextrun = datetime.datetime.strptime(model['@nextrun'],
-                                                       "%Y-%m-%dT%H:%M:%SZ")
+        import xmltodict
+        self.data = xmltodict.parse(data)['weatherdata']
+        model = self.data['meta']['model']
+        if '@nextrun' not in model:
+            model = model[0]
+        self._nextrun = datetime.datetime.strptime(model['@nextrun'],
+                                                   "%Y-%m-%dT%H:%M:%SZ")

From cf4f4ce8c7067f7d6c57a6d4adb506b8ba32b21c Mon Sep 17 00:00:00 2001
From: Daniel <Daniel.H.Iversen@ntnu.no>
Date: Mon, 21 Dec 2015 10:33:19 +0100
Subject: [PATCH 16/18] changed to use requestes in stead of urllib for yr
 sensor

---
 homeassistant/components/sensor/yr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeassistant/components/sensor/yr.py b/homeassistant/components/sensor/yr.py
index cad263b37b8..36dd193da97 100644
--- a/homeassistant/components/sensor/yr.py
+++ b/homeassistant/components/sensor/yr.py
@@ -135,7 +135,7 @@ class YrSensor(Entity):
     def state_attributes(self):
         """ Returns state attributes. """
         data = {}
-        data[''] = self._info + "Weather forecast from yr.no, delivered by the"\
+        data[''] = "Weather forecast from yr.no, delivered by the"\
             " Norwegian Meteorological Institute and the NRK"
         if self.type == 'symbol':
             symbol_nr = self._state

From 8159d36114c13fe2d06c59db8b4213f6ce5142e5 Mon Sep 17 00:00:00 2001
From: Daniel <Daniel.H.Iversen@ntnu.no>
Date: Mon, 21 Dec 2015 10:36:25 +0100
Subject: [PATCH 17/18] small fix in yr sensor name

---
 homeassistant/components/sensor/yr.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/homeassistant/components/sensor/yr.py b/homeassistant/components/sensor/yr.py
index 36dd193da97..4dec49557e4 100644
--- a/homeassistant/components/sensor/yr.py
+++ b/homeassistant/components/sensor/yr.py
@@ -111,7 +111,6 @@ class YrSensor(Entity):
     """ Implements an Yr.no sensor. """
 
     def __init__(self, sensor_type, weather):
-        self.client_name = 'yr'
         self._name = SENSOR_TYPES[sensor_type][0]
         self.type = sensor_type
         self._state = None
@@ -124,7 +123,7 @@ class YrSensor(Entity):
 
     @property
     def name(self):
-        return '{} {}'.format(self.client_name, self._name)
+        return self._name
 
     @property
     def state(self):

From 9e89197284224c6e39e7edaf88036efaf35835e5 Mon Sep 17 00:00:00 2001
From: Daniel <Daniel.H.Iversen@ntnu.no>
Date: Mon, 21 Dec 2015 10:42:42 +0100
Subject: [PATCH 18/18] small fix in yr sensor name

---
 homeassistant/components/sensor/yr.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/sensor/yr.py b/homeassistant/components/sensor/yr.py
index 4dec49557e4..36dd193da97 100644
--- a/homeassistant/components/sensor/yr.py
+++ b/homeassistant/components/sensor/yr.py
@@ -111,6 +111,7 @@ class YrSensor(Entity):
     """ Implements an Yr.no sensor. """
 
     def __init__(self, sensor_type, weather):
+        self.client_name = 'yr'
         self._name = SENSOR_TYPES[sensor_type][0]
         self.type = sensor_type
         self._state = None
@@ -123,7 +124,7 @@ class YrSensor(Entity):
 
     @property
     def name(self):
-        return self._name
+        return '{} {}'.format(self.client_name, self._name)
 
     @property
     def state(self):