curlify3 0.2__tar.gz → 0.4__tar.gz

{curlify3-0.2 → curlify3-0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: curlify3
-Version: 0.2
+Version: 0.4
 Summary: yet another library to convert request object to curl command
 Home-page: https://github.com/shpaker/curlify3
 Author: A.Shpak
@@ -20,10 +20,11 @@ Description-Content-Type: text/markdown
 [![PyPI](https://img.shields.io/pypi/v/curlify3.svg)](https://pypi.python.org/pypi/curlify3)
 [![PyPI](https://img.shields.io/pypi/dm/curlify3.svg)](https://pypi.python.org/pypi/curlify3)
 
-### Support request's objects of:
+### Support request's objects from:
 
 - requests
 - httpx
+- aiohttp server
 - starlette/fastapi
 
 ## Installation

{curlify3-0.2 → curlify3-0.4}/README.md

@@ -3,10 +3,11 @@
 [![PyPI](https://img.shields.io/pypi/v/curlify3.svg)](https://pypi.python.org/pypi/curlify3)
 [![PyPI](https://img.shields.io/pypi/dm/curlify3.svg)](https://pypi.python.org/pypi/curlify3)
 
-### Support request's objects of:
+### Support request's objects from:
 
 - requests
 - httpx
+- aiohttp server
 - starlette/fastapi
 
 ## Installation

{curlify3-0.2 → curlify3-0.4}/curlify3/__init__.py

@@ -1,6 +1,6 @@
 from curlify3._curl import to_curl, to_curl_async
 
-__version__ = "0.2"
+__version__ = "0.4"
 __all__ = [
     "to_curl",
     "to_curl_async",

{curlify3-0.2 → curlify3-0.4}/curlify3/_curl.py

@@ -29,6 +29,7 @@ def make_curl_cookies(cookies):
 
 def make_multipart_curl_args(body):
     body_parts = []
+    body = body.encode() if isinstance(body, str) else body
     for matched in MULTIPART_FORM_DATA.finditer(body):
         groups = matched.groups()
         body_parts.append(f"-F '{groups[0].decode()}={groups[1].decode()}'")
@@ -38,10 +39,7 @@ def make_multipart_curl_args(body):
     return " ".join(body_parts)
 
 
-def make_curl_body(
-    body,
-    headers,
-):
+def make_curl_body(body, headers):
     if "multipart" in headers.get("content-type", ""):
         return make_multipart_curl_args(body)
     if not body:

curlify3-0.4/curlify3/_req_aiohttp.py

@@ -0,0 +1,15 @@
+from aiohttp import web
+
+from curlify3._base import AsyncBaseRequestData
+
+
+class AiohttpServerRequest(AsyncBaseRequestData):
+    _instance_of = web.Request
+
+    async def body(self):
+        data = await self._request.read()
+        try:
+            return data.decode()
+        except UnicodeDecodeError:
+            pass
+        return data

{curlify3-0.2 → curlify3-0.4}/curlify3/_req_httpx.py

@@ -15,7 +15,7 @@ class HttpxRequest(BaseRequestData):
         return data
 
 
-class AsyncHttpxRequest(AsyncBaseRequestData, HttpxRequest):
+class AsyncHttpxRequest(AsyncBaseRequestData):
     _instance_of = httpx.Request
 
     async def body(self):

{curlify3-0.2 → curlify3-0.4}/curlify3/_utils.py

@@ -22,6 +22,12 @@ with suppress(ImportError):
     _REQUEST_DATA_CLASSES_ASYNC.append(AsyncHttpxRequest)
 
 
+with suppress(ImportError):
+    from curlify3._req_aiohttp import AiohttpServerRequest
+
+    _REQUEST_DATA_CLASSES_ASYNC.append(AiohttpServerRequest)
+
+
 with suppress(ImportError):
     from curlify3._req_starlette import StarletteRequest
 

{curlify3-0.2 → curlify3-0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "curlify3"
-version = "0.2"
+version = "0.4"
 description = "yet another library to convert request object to curl command"
 authors = ["A.Shpak <aleksander.shpak.als@gmail.com>"]
 readme = "README.md"
@@ -15,8 +15,8 @@ requests = "^2.32.3"
 httpx = "^0.27.2"
 fastapi = "^0.115.4"
 isort = "^5.13.2"
-
-[tool.poetry.group.tests.dependencies]
+aiohttp = "^3.10.10"
+pytest-aiohttp = "^1.0.5"
 pytest = "^8.3.3"
 pytest-asyncio = "^0.24.0"
 pytest-httpx = "^0.33.0"