python3-commons 0.20.9__tar.gz → 0.20.11__tar.gz

{python3_commons-0.20.9/src/python3_commons.egg-info → python3_commons-0.20.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.20.9
+Version: 0.20.11
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0

{python3_commons-0.20.9 → python3_commons-0.20.11}/src/python3_commons/api_client.py

@@ -50,7 +50,7 @@ async def request(
     method: Literal['get', 'post', 'put', 'patch', 'options', 'head', 'delete'] = 'get',
     headers: Mapping | None = None,
     json: Mapping | Sequence | str | None = None,
-    data: bytes | None = None,
+    data: Mapping | bytes | None = None,
     timeout: ClientTimeout | Enum | None = None,
     audit_name: str | None = None,
 ) -> AsyncGenerator[ClientResponse]:

{python3_commons-0.20.9 → python3_commons-0.20.11}/src/python3_commons/auth.py

@@ -204,8 +204,9 @@ class OIDCClient:
                 openid_config['token_endpoint'],
                 '',
                 method='post',
-                json=data,
+                data=data,
                 headers={'Content-Type': 'application/x-www-form-urlencoded'},
+                audit_name=self._audit_name,
             ) as response:
                 payload = await response.read()
 

{python3_commons-0.20.9 → python3_commons-0.20.11}/src/python3_commons/helpers.py

@@ -94,34 +94,35 @@ def request_to_curl(
     headers: Mapping | None = None,
     cookies: BaseCookie[str] | None = None,
     json: Mapping | Sequence | str | None = None,
-    data: bytes | None = None,
+    data: Mapping | bytes | None = None,
 ) -> str:
     if query:
-        url = f'{url}?{urlencode(query)}'
+        url = f'{url}?{urlencode(query, doseq=True)}'
 
-    curl_cmd = ['curl', '-i', '-X', method.upper(), shlex.quote(url)]
+    curl_cmd: list[str] = ['curl', '-i', '-X', method.upper(), url]
 
     if headers:
         for key, value in headers.items():
-            header_line = f'{key}: {value}'
-            curl_cmd.append('-H')
-            curl_cmd.append(shlex.quote(header_line))
+            curl_cmd += ['-H', f'{key}: {value}']
 
     if cookies:
         cookie_str = '; '.join(f'{k}={v.value}' for k, v in cookies.items())
-        curl_cmd.extend(['-b', shlex.quote(cookie_str)])
+        curl_cmd += ['-b', cookie_str]
 
     if json:
-        curl_cmd.append('-H')
-        curl_cmd.append(shlex.quote('Content-Type: application/json'))
-
-        curl_cmd.append('-d')
-        curl_cmd.append(shlex.quote(dumps(json, cls=CustomJSONEncoder)))
+        curl_cmd += ['-H', 'Content-Type: application/json', '-d', dumps(json, cls=CustomJSONEncoder)]
     elif data:
-        curl_cmd.append('-d')
-        curl_cmd.append(shlex.quote(data.decode('utf-8')))
+        body = None
+
+        if isinstance(data, dict):
+            body = urlencode(data, doseq=True)
+        elif isinstance(data, bytes):
+            body = data.decode('utf-8')
+
+        if body:
+            curl_cmd += ['-d', body]
 
-    return ' '.join(curl_cmd)
+    return ' '.join(shlex.quote(part) for part in curl_cmd)
 
 
 def log_execution_time(func):

{python3_commons-0.20.9 → python3_commons-0.20.11/src/python3_commons.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.20.9
+Version: 0.20.11
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0