Improve code

Author: bouwew

plugwise/smile.py

@@ -87,8 +87,6 @@ async def _create_session() -> aiohttp.ClientSession:
             self.websession = websession
 
         self._auth = aiohttp.BasicAuth(username, password=password)
-        # Work-around for Stretchv2-aiohttp-deflate-error, can be removed for aiohttp v3.7
-        self._headers = {"Accept-Encoding": "gzip"}
 
         self._timeout = timeout
         self._endpoint = f"http://{host}:{str(port)}"
@@ -226,25 +224,21 @@ async def request(
         resp = None
         url = f"{self._endpoint}{command}"
 
-        if headers is None:
-            headers = {"Content-type": "text/xml"}
-
         try:
             with async_timeout.timeout(self._timeout):
                 if method == "get":
-                    # Work-around, see above, can be removed for aiohttp v3.7:
+                    # Work-around for Stretchv2, should not hurt the other smiles
+                    headers = {"Accept-Encoding": "gzip"}
                     resp = await self.websession.get(
-                        url, auth=self._auth, headers=self._headers
+                        url, auth=self._auth, headers=headers
                     )
                 if method == "put":
+                    headers = {"Content-type": "text/xml"}
                     resp = await self.websession.put(
                         url, data=data, headers=headers, auth=self._auth
                     )
                 if method == "delete":
                     resp = await self.websession.delete(url, auth=self._auth)
-            if resp.status == 401:
-                raise InvalidAuthentication
-
         except asyncio.TimeoutError:
             if retry < 1:
                 _LOGGER.error("Timed out sending command to Plugwise: %s", command)
@@ -258,6 +252,9 @@ async def request(
         if method == "put" and resp.status == 200:
             return
 
+        if resp.status == 401:
+            raise InvalidAuthentication
+
         result = await resp.text()
         if not result or "<error>" in result:
             _LOGGER.error("Smile response empty or error in %s", result)