python-amazon-sp-api 2.1.4__tar.gz → 2.1.6__tar.gz

{python_amazon_sp_api-2.1.4/python_amazon_sp_api.egg-info → python_amazon_sp_api-2.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-amazon-sp-api
-Version: 2.1.4
+Version: 2.1.6
 Summary: Python wrapper for the Amazon Selling-Partner API
 Home-page: https://github.com/saleweaver/python-amazon-sp-api
 Author: Michael Primke

{python_amazon_sp_api-2.1.4 → python_amazon_sp_api-2.1.6/python_amazon_sp_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-amazon-sp-api
-Version: 2.1.4
+Version: 2.1.6
 Summary: Python wrapper for the Amazon Selling-Partner API
 Home-page: https://github.com/saleweaver/python-amazon-sp-api
 Author: Michael Primke

python_amazon_sp_api-2.1.6/sp_api/__version__.py

@@ -0,0 +1 @@
+__version__ = '2.1.6'

{python_amazon_sp_api-2.1.4 → python_amazon_sp_api-2.1.6}/sp_api/api/data_kiosk/data_kiosk.py

@@ -1,9 +1,11 @@
-import httpx
 import urllib.parse
 from io import BytesIO, StringIO
 from typing import Union, BinaryIO, TextIO
 
+import httpx
+
 from sp_api.base import Client, sp_endpoint, fill_query_params, ApiResponse
+from sp_api.base._transport_httpx import _httpx_client_kwargs
 
 
 class DataKiosk(Client):
@@ -197,8 +199,10 @@ class DataKiosk(Client):
         )
         if download or file or ("decrypt" in kwargs and kwargs["decrypt"]):
             with httpx.Client(
-                proxies=self.proxies,
-                verify=self.verify,
+                **_httpx_client_kwargs(
+                    proxies=self.proxies,
+                    verify=self.verify,
+                )
             ) as client:
                 document_response = client.get(res.payload.get("documentUrl"))
                 document = document_response.content

{python_amazon_sp_api-2.1.4 → python_amazon_sp_api-2.1.6}/sp_api/api/reports/reports.py

@@ -10,6 +10,7 @@ from sp_api.base import (
     ApiResponse,
     Marketplaces,
 )
+from sp_api.base._transport_httpx import _httpx_client_kwargs
 from sp_api.util import (
     normalize_csv_param,
     normalize_datetime_kwargs,
@@ -367,15 +368,19 @@ class Reports(Client):
         if download or file or ("decrypt" in kwargs and kwargs["decrypt"]):
             compression_algorithm = res.payload.get("compressionAlgorithm")
             with httpx.Client(
-                proxies=self.proxies,
-                verify=self.verify,
-                timeout=timeout,
+                **_httpx_client_kwargs(
+                    proxies=self.proxies,
+                    verify=self.verify,
+                    timeout=timeout,
+                )
             ) as client:
                 if stream and file:
                     with client.stream("GET", res.payload.get("url")) as document_response:
                         if not character_code:
                             character_code = resolve_character_code(
-                                document_response.encoding, fallback="iso-8859-1"
+                                document_response.encoding,
+                                fallback="iso-8859-1",
+                                response_charset_encoding=getattr(document_response, "charset_encoding", None),
                             )
                         stream_to_file_sync(
                             document_response,
@@ -387,7 +392,9 @@ class Reports(Client):
                     document_response = client.get(res.payload.get("url"))
                     if not character_code:
                         character_code = resolve_character_code(
-                            document_response.encoding, fallback="iso-8859-1"
+                            document_response.encoding,
+                            fallback="iso-8859-1",
+                            response_charset_encoding=getattr(document_response, "charset_encoding", None),
                         )
                     document = decompress_bytes(
                         document_response.content, compression_algorithm

{python_amazon_sp_api-2.1.4 → python_amazon_sp_api-2.1.6}/sp_api/asyncio/api/reports/reports.py

@@ -373,7 +373,9 @@ class Reports(AsyncBaseClient):
                 ) as document_response:
                     if not character_code:
                         character_code = resolve_character_code(
-                            document_response.encoding, fallback="iso-8859-1"
+                            document_response.encoding,
+                            fallback="iso-8859-1",
+                            response_charset_encoding=getattr(document_response, "charset_encoding", None),
                         )
                     await stream_to_file_async(
                         document_response,
@@ -389,7 +391,9 @@ class Reports(AsyncBaseClient):
                 )
                 if not character_code:
                     character_code = resolve_character_code(
-                        document_response.encoding, fallback="iso-8859-1"
+                        document_response.encoding,
+                        fallback="iso-8859-1",
+                        response_charset_encoding=getattr(document_response, "charset_encoding", None),
                     )
                 document = decompress_bytes(
                     document_response.content, compression_algorithm

{python_amazon_sp_api-2.1.4 → python_amazon_sp_api-2.1.6}/sp_api/base/_transport_httpx.py

@@ -1,15 +1,32 @@
+import random
+
 import httpx
 
 
+def _httpx_client_kwargs(*, proxies=None, verify=True, timeout=None):
+    client_kwargs = {"verify": verify}
+    if timeout is not None:
+        client_kwargs["timeout"] = timeout
+    if proxies is not None:
+        if isinstance(proxies, (list, tuple)):
+            proxy_value = random.choice(proxies)
+        else:
+            proxy_value = proxies
+        client_kwargs["proxy"] = proxy_value
+    return client_kwargs
+
+
 class HttpxTransport:
     def __init__(
         self, *, timeout=None, proxies=None, proxy=None, verify=True, client=None
     ):
         proxy_config = proxy if proxy is not None else proxies
         self._client = client or httpx.Client(
-            timeout=timeout,
-            proxy=proxy_config,
-            verify=verify,
+            **_httpx_client_kwargs(
+                timeout=timeout,
+                proxies=proxy_config,
+                verify=verify,
+            )
         )
 
     def request(self, method, url, *, params=None, data=None, content=None, headers=None):

{python_amazon_sp_api-2.1.4 → python_amazon_sp_api-2.1.6}/sp_api/util/report_document.py

@@ -3,8 +3,24 @@ import zlib
 from io import BytesIO, StringIO
 
 
-def resolve_character_code(response_encoding, fallback="iso-8859-1"):
-    character_code = response_encoding or fallback
+def resolve_character_code(
+    response_encoding=None,
+    fallback="iso-8859-1",
+    response_charset_encoding=None,
+):
+    """Resolve report text encoding while preserving pre-httpx behavior.
+
+    requests exposed ``None`` when a response had no charset, and the reports
+    client then fell back to iso-8859-1. httpx exposes ``utf-8`` by default in
+    the same scenario, so we treat implicit utf-8 as "missing" and keep the
+    historical fallback.
+    """
+    if response_charset_encoding:
+        character_code = response_charset_encoding
+    elif response_encoding and response_encoding.lower() != "utf-8":
+        character_code = response_encoding
+    else:
+        character_code = fallback
     if character_code and character_code.lower() == "windows-31j":
         character_code = "cp932"
     return character_code

python_amazon_sp_api-2.1.4/sp_api/__version__.py

@@ -1 +0,0 @@
-__version__ = '2.1.4'