aioamazondevices 3.2.1__py3-none-any.whl → 3.2.3__py3-none-any.whl

aioamazondevices/__init__.py

@@ -1,6 +1,6 @@
 """aioamazondevices library."""
 
-__version__ = "3.2.1"
+__version__ = "3.2.3"
 
 
 from .api import AmazonDevice, AmazonEchoApi

aioamazondevices/api.py

@@ -148,9 +148,15 @@ class AmazonEchoApi:
         self.session: ClientSession
         self._devices: dict[str, Any] = {}
 
-        lang_object = Language.make(territory=self._login_country_code.upper())
-        lang_maximized = lang_object.maximize()
-        self._language = f"{lang_maximized.language}-{lang_maximized.region}"
+        if locale and (lang := locale.get("language")):
+            language = lang
+        else:
+            lang_object = Language.make(territory=self._login_country_code.upper())
+            lang_maximized = lang_object.maximize()
+            language = f"{lang_maximized.language}-{lang_maximized.region}"
+
+        self._language = language
+
         _LOGGER.debug(
             "Initialize library with domain <%s> and language <%s>",
             self._domain,
@@ -352,7 +358,7 @@ class AmazonEchoApi:
         if not amazon_user_agent:
             _LOGGER.debug("Changing User-Agent to %s", DEFAULT_AGENT)
             headers.update({"User-Agent": DEFAULT_AGENT})
-        if self._csrf_cookie and CSRF_COOKIE not in headers:
+        if self._csrf_cookie:
             csrf = {CSRF_COOKIE: self._csrf_cookie}
             _LOGGER.debug("Adding <%s> to headers", csrf)
             headers.update(csrf)
@@ -377,6 +383,9 @@ class AmazonEchoApi:
             raise CannotConnect(f"Connection error during {method}") from exc
 
         self._cookies.update(**await self._parse_cookies_from_headers(resp.headers))
+        if not self._csrf_cookie:
+            self._csrf_cookie = resp.cookies.get(CSRF_COOKIE, Morsel()).value
+            _LOGGER.debug("CSRF cookie value: <%s>", self._csrf_cookie)
 
         content_type: str = resp.headers.get("Content-Type", "")
         _LOGGER.debug(
@@ -786,11 +795,6 @@ class AmazonEchoApi:
             _LOGGER.debug("Response code: |%s|", response_code)
 
             response_data = await raw_resp.text()
-
-            if not self._csrf_cookie:
-                self._csrf_cookie = raw_resp.cookies.get(CSRF_COOKIE, Morsel()).value
-                _LOGGER.debug("CSRF cookie value: <%s>", self._csrf_cookie)
-
             json_data = {} if len(response_data) == 0 else await raw_resp.json()
 
             _LOGGER.debug("JSON data: |%s|", scrub_fields(json_data))

aioamazondevices/const.py

@@ -34,6 +34,7 @@ DOMAIN_BY_ISO3166_COUNTRY = {
     },
     "at": {
         "domain": "de",
+        "language": "en-US",
         "openid.assoc_handle": f"{DEFAULT_ASSOC_HANDLE}_de",
     },
     "au": {

{aioamazondevices-3.2.1.dist-info → aioamazondevices-3.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aioamazondevices
-Version: 3.2.1
+Version: 3.2.3
 Summary: Python library to control Amazon devices
 License: Apache-2.0
 Author: Simone Chemelli

aioamazondevices-3.2.3.dist-info/RECORD

@@ -0,0 +1,11 @@
+aioamazondevices/__init__.py,sha256=ym9BWa7TjPo80kc9b_xrVPeW1cq_Xh_eDwduw3soMh4,276
+aioamazondevices/api.py,sha256=3o64TiaYVq_kG5upZnOynmey2Ls7ZhH7xPigFykxq8Y,39309
+aioamazondevices/const.py,sha256=iJ87rGFZi9FY8M-dPsFY3DNYltiJ_PCjlr4RxQtZlJQ,8716
+aioamazondevices/exceptions.py,sha256=CfOFKDvE_yl5BFoFcpTOuDfgRi_2oAtKk-nNJgfWBAs,726
+aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+aioamazondevices/sounds.py,sha256=01pVCDFIuhrLypXInw4JNuHsC6zjMLsuKocet1R6we8,13409
+aioamazondevices/utils.py,sha256=RzuKRhnq_8ymCoJMoQJ2vBYyuew06RSWpqQWmqdNczE,2019
+aioamazondevices-3.2.3.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-3.2.3.dist-info/METADATA,sha256=AZomsCQfXV4PWyyspc4PU1Xzq7HTeM7iRKbxzbU7yck,5234
+aioamazondevices-3.2.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+aioamazondevices-3.2.3.dist-info/RECORD,,

aioamazondevices-3.2.1.dist-info/RECORD

@@ -1,11 +0,0 @@
-aioamazondevices/__init__.py,sha256=ylzOup7JB2cQ19iiOzvj0UaBpJlY2v4hV0fxxJyVeqo,276
-aioamazondevices/api.py,sha256=8wXIou_9WeFjbNS4_qPbQ8YFWUfN8EdIbivQ-UWSGDI,39218
-aioamazondevices/const.py,sha256=q2TlD1O4jPtQ-hIxCCZuD-uoXCFNudF11JSjSC2hClY,8687
-aioamazondevices/exceptions.py,sha256=CfOFKDvE_yl5BFoFcpTOuDfgRi_2oAtKk-nNJgfWBAs,726
-aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aioamazondevices/sounds.py,sha256=01pVCDFIuhrLypXInw4JNuHsC6zjMLsuKocet1R6we8,13409
-aioamazondevices/utils.py,sha256=RzuKRhnq_8ymCoJMoQJ2vBYyuew06RSWpqQWmqdNczE,2019
-aioamazondevices-3.2.1.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-3.2.1.dist-info/METADATA,sha256=qS7EZlIpIOa1F0BMNwW0Z3iAI_g5vFlXv3WSitr7NqI,5234
-aioamazondevices-3.2.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-aioamazondevices-3.2.1.dist-info/RECORD,,