aiohttp 2 (#6835)

* Upgrade aiohttp2

* Fix resource caching

* Fix helpers.aiohttp_client

* Lint

* Use static path for api error_log

* Fix ClientErrors import

* Remove not needed DisconnectError

* Remove releasing responses code

* Add timeout if stream starts non responding

* More async_aiohttp_proxy_stream cleanup

* Fix references to ClientError

* Fix fingerprinting

* Fix aiohttp stream tests

* Rename aiohttp_proxy_stream

* Remove impossible darksky test

* Fix sleepiq requests escaping mocker

* Lint

* Remove deprecated parameter

* Break up aiohttp_proxy_stream in 2 methods

* Lint

* Upgrade to aiohttp 2.0.4

* Convert connector close to a callback

* Fix static fingerprinted links

homeassistant/components/sensor/yr.py

@@ -151,6 +151,8 @@ class YrData(object):
     @asyncio.coroutine
     def async_update(self, *_):
         """Get the latest data from yr.no."""
+        import xmltodict
+
         def try_again(err: str):
             """Retry in 15 minutes."""
             _LOGGER.warning('Retrying in 15 minutes: %s', err)
@@ -161,7 +163,6 @@ class YrData(object):
                                               nxt)
 
         if self._nextrun is None or dt_util.utcnow() >= self._nextrun:
-            resp = None
             try:
                 websession = async_get_clientsession(self.hass)
                 with async_timeout.timeout(10, loop=self.hass.loop):
@@ -172,17 +173,11 @@ class YrData(object):
                     return
                 text = yield from resp.text()
 
-            except (asyncio.TimeoutError, aiohttp.errors.ClientError,
-                    aiohttp.errors.ClientDisconnectedError) as err:
+            except (asyncio.TimeoutError, aiohttp.ClientError) as err:
                 try_again(err)
                 return
 
-            finally:
-                if resp is not None:
-                    yield from resp.release()
-
             try:
-                import xmltodict
                 self.data = xmltodict.parse(text)['weatherdata']
                 model = self.data['meta']['model']
                 if '@nextrun' not in model: