Request(content=...) -> Request(data=...)

diff --git a/httpcore/adapters/redirects.py b/httpcore/adapters/redirects.py
index 0a79b4c937755c7c9e75c6c0262de30c1e9555a7..08639cd8643fb524d160cfe20df12013dfffe6df 100644 (file)
--- a/httpcore/adapters/redirects.py
+++ b/httpcore/adapters/redirects.py
@@ -65,7 +65,7 @@ class RedirectAdapter(Adapter):
         url = self.redirect_url(request, response)
         headers = self.redirect_headers(request, url)
         content = self.redirect_content(request, method)
-        return Request(method=method, url=url, headers=headers, content=content)
+        return Request(method=method, url=url, headers=headers, data=content)
 
     def redirect_method(self, request: Request, response: Response) -> str:
         """

diff --git a/httpcore/backends/sync.py b/httpcore/backends/sync.py
index ae8319412a5c2b4db6362c653c0b0c36d61aec32..2bb582a5dc9cb1a7a9aa0fc68a364d48d450816a 100644 (file)
--- a/httpcore/backends/sync.py
+++ b/httpcore/backends/sync.py
@@ -14,10 +14,11 @@ from ..config import (
 )
 from ..models import (
     URL,
-    ByteOrByteStream,
     Headers,
     HeaderTypes,
+    QueryParamTypes,
     Request,
+    RequestData,
     Response,
     URLTypes,
 )
@@ -100,14 +101,17 @@ class SyncClient:
         method: str,
         url: URLTypes,
         *,
-        content: ByteOrByteStream = b"",
+        data: RequestData = b"",
+        query_params: QueryParamTypes = None,
         headers: HeaderTypes = None,
         stream: bool = False,
         allow_redirects: bool = True,
         ssl: SSLConfig = None,
         timeout: TimeoutConfig = None,
     ) -> SyncResponse:
-        request = Request(method, url, headers=headers, content=content)
+        request = Request(
+            method, url, data=data, query_params=query_params, headers=headers
+        )
         self.prepare_request(request)
         response = self.send(
             request,
@@ -122,6 +126,7 @@ class SyncClient:
         self,
         url: URLTypes,
         *,
+        query_params: QueryParamTypes = None,
         headers: HeaderTypes = None,
         stream: bool = False,
         allow_redirects: bool = True,
@@ -142,6 +147,7 @@ class SyncClient:
         self,
         url: URLTypes,
         *,
+        query_params: QueryParamTypes = None,
         headers: HeaderTypes = None,
         stream: bool = False,
         allow_redirects: bool = True,
@@ -162,6 +168,7 @@ class SyncClient:
         self,
         url: URLTypes,
         *,
+        query_params: QueryParamTypes = None,
         headers: HeaderTypes = None,
         stream: bool = False,
         allow_redirects: bool = False,  #  Note: Differs to usual default.
@@ -182,7 +189,8 @@ class SyncClient:
         self,
         url: URLTypes,
         *,
-        content: ByteOrByteStream = b"",
+        data: RequestData = b"",
+        query_params: QueryParamTypes = None,
         headers: HeaderTypes = None,
         stream: bool = False,
         allow_redirects: bool = True,
@@ -192,7 +200,7 @@ class SyncClient:
         return self.request(
             "POST",
             url,
-            content=content,
+            data=data,
             headers=headers,
             stream=stream,
             allow_redirects=allow_redirects,
@@ -204,7 +212,8 @@ class SyncClient:
         self,
         url: URLTypes,
         *,
-        content: ByteOrByteStream = b"",
+        data: RequestData = b"",
+        query_params: QueryParamTypes = None,
         headers: HeaderTypes = None,
         stream: bool = False,
         allow_redirects: bool = True,
@@ -214,7 +223,7 @@ class SyncClient:
         return self.request(
             "PUT",
             url,
-            content=content,
+            data=data,
             headers=headers,
             stream=stream,
             allow_redirects=allow_redirects,
@@ -226,7 +235,8 @@ class SyncClient:
         self,
         url: URLTypes,
         *,
-        content: ByteOrByteStream = b"",
+        data: RequestData = b"",
+        query_params: QueryParamTypes = None,
         headers: HeaderTypes = None,
         stream: bool = False,
         allow_redirects: bool = True,
@@ -236,7 +246,7 @@ class SyncClient:
         return self.request(
             "PATCH",
             url,
-            content=content,
+            data=data,
             headers=headers,
             stream=stream,
             allow_redirects=allow_redirects,
@@ -248,7 +258,8 @@ class SyncClient:
         self,
         url: URLTypes,
         *,
-        content: ByteOrByteStream = b"",
+        data: RequestData = b"",
+        query_params: QueryParamTypes = None,
         headers: HeaderTypes = None,
         stream: bool = False,
         allow_redirects: bool = True,
@@ -258,7 +269,7 @@ class SyncClient:
         return self.request(
             "DELETE",
             url,
-            content=content,
+            data=data,
             headers=headers,
             stream=stream,
             allow_redirects=allow_redirects,

diff --git a/httpcore/client.py b/httpcore/client.py
index a3e31f1d1591d340621422064880415f5bab70a7..16925b3101f949bbb7c0d3443e4faf34eca23ddd 100644 (file)
--- a/httpcore/client.py
+++ b/httpcore/client.py
@@ -17,10 +17,10 @@ from .config import (
 from .dispatch.connection_pool import ConnectionPool
 from .models import (
     URL,
-    ByteOrByteStream,
     HeaderTypes,
     QueryParamTypes,
     Request,
+    RequestData,
     Response,
     URLTypes,
 )
@@ -49,7 +49,7 @@ class Client:
         method: str,
         url: URLTypes,
         *,
-        content: ByteOrByteStream = b"",
+        data: RequestData = b"",
         query_params: QueryParamTypes = None,
         headers: HeaderTypes = None,
         stream: bool = False,
@@ -58,7 +58,7 @@ class Client:
         timeout: TimeoutConfig = None,
     ) -> Response:
         request = Request(
-            method, url, query_params=query_params, headers=headers, content=content
+            method, url, data=data, query_params=query_params, headers=headers
         )
         self.prepare_request(request)
         response = await self.send(
@@ -140,7 +140,7 @@ class Client:
         self,
         url: URLTypes,
         *,
-        content: ByteOrByteStream = b"",
+        data: RequestData = b"",
         query_params: QueryParamTypes = None,
         headers: HeaderTypes = None,
         stream: bool = False,
@@ -151,7 +151,7 @@ class Client:
         return await self.request(
             "POST",
             url,
-            content=content,
+            data=data,
             query_params=query_params,
             headers=headers,
             stream=stream,
@@ -164,7 +164,7 @@ class Client:
         self,
         url: URLTypes,
         *,
-        content: ByteOrByteStream = b"",
+        data: RequestData = b"",
         query_params: QueryParamTypes = None,
         headers: HeaderTypes = None,
         stream: bool = False,
@@ -175,7 +175,7 @@ class Client:
         return await self.request(
             "PUT",
             url,
-            content=content,
+            data=data,
             query_params=query_params,
             headers=headers,
             stream=stream,
@@ -188,7 +188,7 @@ class Client:
         self,
         url: URLTypes,
         *,
-        content: ByteOrByteStream = b"",
+        data: RequestData = b"",
         query_params: QueryParamTypes = None,
         headers: HeaderTypes = None,
         stream: bool = False,
@@ -199,7 +199,7 @@ class Client:
         return await self.request(
             "PATCH",
             url,
-            content=content,
+            data=data,
             query_params=query_params,
             headers=headers,
             stream=stream,
@@ -212,7 +212,7 @@ class Client:
         self,
         url: URLTypes,
         *,
-        content: ByteOrByteStream = b"",
+        data: RequestData = b"",
         query_params: QueryParamTypes = None,
         headers: HeaderTypes = None,
         stream: bool = False,
@@ -223,7 +223,7 @@ class Client:
         return await self.request(
             "DELETE",
             url,
-            content=content,
+            data=data,
             query_params=query_params,
             headers=headers,
             stream=stream,

diff --git a/httpcore/interfaces.py b/httpcore/interfaces.py
index 2ada76c85f615b1b4b9363b216aed4c1129a81a9..5903c454566d6eae01e8b0b1f3196d209c35473b 100644 (file)
--- a/httpcore/interfaces.py
+++ b/httpcore/interfaces.py
@@ -2,7 +2,15 @@ import typing
 from types import TracebackType
 
 from .config import TimeoutConfig
-from .models import URL, ByteOrByteStream, HeaderTypes, Request, Response, URLTypes
+from .models import (
+    URL,
+    HeaderTypes,
+    QueryParamTypes,
+    Request,
+    RequestData,
+    Response,
+    URLTypes,
+)
 
 OptionalTimeout = typing.Optional[TimeoutConfig]
 
@@ -21,11 +29,14 @@ class Adapter:
         method: str,
         url: URLTypes,
         *,
+        data: RequestData = b"",
+        query_params: QueryParamTypes = None,
         headers: HeaderTypes = None,
-        content: ByteOrByteStream = b"",
         **options: typing.Any,
     ) -> Response:
-        request = Request(method, url, headers=headers, content=content)
+        request = Request(
+            method, url, data=data, query_params=query_params, headers=headers
+        )
         self.prepare_request(request)
         response = await self.send(request, **options)
         return response

diff --git a/httpcore/models.py b/httpcore/models.py
index 5eeec460b7a298fdefb7974e2793d565b6c2983c..3e235f428686eac84847ada1d1d2daefca707216 100644 (file)
--- a/httpcore/models.py
+++ b/httpcore/models.py
@@ -44,7 +44,9 @@ HeaderTypes = typing.Union[
     typing.List[typing.Tuple[typing.AnyStr, typing.AnyStr]],
 ]
 
-ByteOrByteStream = typing.Union[bytes, typing.AsyncIterator[bytes]]
+RequestData = typing.Union[bytes, typing.AsyncIterator[bytes]]
+
+ResponseContent = typing.Union[bytes, typing.AsyncIterator[bytes]]
 
 
 class URL:
@@ -456,18 +458,18 @@ class Request:
         method: str,
         url: typing.Union[str, URL],
         *,
+        data: RequestData = b"",
         query_params: QueryParamTypes = None,
         headers: HeaderTypes = None,
-        content: ByteOrByteStream = b"",
     ):
         self.method = method.upper()
         self.url = URL(url, query_params=query_params)
-        if isinstance(content, bytes):
+        if isinstance(data, bytes):
             self.is_streaming = False
-            self.content = content
+            self.content = data
         else:
             self.is_streaming = True
-            self.content_aiter = content
+            self.content_aiter = data
         self.headers = Headers(headers)
 
     async def read(self) -> bytes:
@@ -532,7 +534,7 @@ class Response:
         reason_phrase: str = None,
         protocol: str = None,
         headers: HeaderTypes = None,
-        content: ByteOrByteStream = b"",
+        content: ResponseContent = b"",
         on_close: typing.Callable = None,
         request: Request = None,
         history: typing.List["Response"] = None,

diff --git a/tests/adapters/test_redirects.py b/tests/adapters/test_redirects.py
index 574b6dc531f7e24a4bdf3fe25cbb526a76d61202..94e5a745db77de995f8af1df62a917b382a9cbae 100644 (file)
--- a/tests/adapters/test_redirects.py
+++ b/tests/adapters/test_redirects.py
@@ -222,8 +222,8 @@ async def test_same_domain_redirect():
 async def test_body_redirect():
     client = RedirectAdapter(MockDispatch())
     url = "https://example.org/redirect_body"
-    content = b"Example request body"
-    response = await client.request("POST", url, content=content)
+    data = b"Example request body"
+    response = await client.request("POST", url, data=data)
     data = json.loads(response.content.decode())
     assert response.url == URL("https://example.org/redirect_body_target")
     assert data == {"body": "Example request body"}
@@ -238,4 +238,4 @@ async def test_cannot_redirect_streaming_body():
         yield b"Example request body"
 
     with pytest.raises(RedirectBodyUnavailable):
-        await client.request("POST", url, content=streaming_body())
+        await client.request("POST", url, data=streaming_body())

diff --git a/tests/dispatch/test_http2.py b/tests/dispatch/test_http2.py
index 0adf7b8a921f53c83f479f3757aefc8aa6078cad..b9bf8ccf49c0ea8029f7bdf4915167d513cab351 100644 (file)
--- a/tests/dispatch/test_http2.py
+++ b/tests/dispatch/test_http2.py
@@ -92,7 +92,7 @@ async def test_http2_get_request():
 async def test_http2_post_request():
     server = MockServer()
     async with httpcore.HTTP2Connection(reader=server, writer=server) as conn:
-        response = await conn.request("POST", "http://example.org", content=b"<data>")
+        response = await conn.request("POST", "http://example.org", data=b"<data>")
     assert response.status_code == 200
     assert json.loads(response.content) == {
         "method": "POST",

diff --git a/tests/models/test_requests.py b/tests/models/test_requests.py
index 98eea510dce422295561054bbd16ea427a89c178..6c20efd5f604170051807d55563b3a4f6e5c1ec0 100644 (file)
--- a/tests/models/test_requests.py
+++ b/tests/models/test_requests.py
@@ -17,7 +17,7 @@ def test_host_header():
 
 
 def test_content_length_header():
-    request = httpcore.Request("POST", "http://example.org", content=b"test 123")
+    request = httpcore.Request("POST", "http://example.org", data=b"test 123")
     request.prepare()
     assert request.headers == httpcore.Headers(
         [
@@ -32,9 +32,9 @@ def test_transfer_encoding_header():
     async def streaming_body(data):
         yield data  # pragma: nocover
 
-    content = streaming_body(b"test 123")
+    data = streaming_body(b"test 123")
 
-    request = httpcore.Request("POST", "http://example.org", content=content)
+    request = httpcore.Request("POST", "http://example.org", data=data)
     request.prepare()
     assert request.headers == httpcore.Headers(
         [
@@ -69,11 +69,11 @@ def test_override_content_length_header():
     async def streaming_body(data):
         yield data  # pragma: nocover
 
-    content = streaming_body(b"test 123")
+    data = streaming_body(b"test 123")
     headers = [(b"content-length", b"8")]
 
     request = httpcore.Request(
-        "POST", "http://example.org", content=content, headers=headers
+        "POST", "http://example.org", data=data, headers=headers
     )
     request.prepare()
     assert request.headers == httpcore.Headers(

diff --git a/tests/test_client.py b/tests/test_client.py
index 1d33379c60be03c66d2ccebacb16e1dfe9e06a26..cd6437ae6aaf24886114de63babf1567b85a240d 100644 (file)
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -16,7 +16,7 @@ async def test_get(server):
 async def test_post(server):
     url = "http://127.0.0.1:8000/"
     async with httpcore.Client() as client:
-        response = await client.post(url, content=b"Hello, world!")
+        response = await client.post(url, data=b"Hello, world!")
     assert response.status_code == 200
 
 
@@ -47,7 +47,7 @@ async def test_stream_request(server):
 
     async with httpcore.Client() as client:
         response = await client.request(
-            "POST", "http://127.0.0.1:8000/", content=hello_world()
+            "POST", "http://127.0.0.1:8000/", data=hello_world()
         )
     assert response.status_code == 200
 

diff --git a/tests/test_sync.py b/tests/test_sync.py
index 99b6c1887a2f4781c180cc4da7188faf620947d8..b5f55cefd184a4a7ccf2194a7186c765460eb204 100644 (file)
--- a/tests/test_sync.py
+++ b/tests/test_sync.py
@@ -35,7 +35,7 @@ def test_get(server):
 @threadpool
 def test_post(server):
     with httpcore.SyncClient() as http:
-        response = http.post("http://127.0.0.1:8000/", content=b"Hello, world!")
+        response = http.post("http://127.0.0.1:8000/", data=b"Hello, world!")
     assert response.status_code == 200
     assert response.reason_phrase == "OK"