Prefer 'content' over 'body'

diff --git a/httpcore/adapters/redirects.py b/httpcore/adapters/redirects.py
index 2d4df0d5cb1242559d9a247c40b809ff4231fa68..1749872719b37735d31ff103f6a6bfa3086f0754 100644 (file)
--- a/httpcore/adapters/redirects.py
+++ b/httpcore/adapters/redirects.py
@@ -66,8 +66,8 @@ class RedirectAdapter(Adapter):
         method = self.redirect_method(request, response)
         url = self.redirect_url(request, response)
         headers = self.redirect_headers(request, url)
-        body = self.redirect_body(request, method)
-        return Request(method=method, url=url, headers=headers, body=body)
+        content = self.redirect_content(request, method)
+        return Request(method=method, url=url, headers=headers, content=content)
 
     def redirect_method(self, request: Request, response: Response) -> str:
         """
@@ -128,7 +128,7 @@ class RedirectAdapter(Adapter):
             del headers["Authorization"]
         return headers
 
-    def redirect_body(self, request: Request, method: str) -> bytes:
+    def redirect_content(self, request: Request, method: str) -> bytes:
         """
         Return the body that should be used for the redirect request.
         """
@@ -136,4 +136,4 @@ class RedirectAdapter(Adapter):
             return b""
         if request.is_streaming:
             raise RedirectBodyUnavailable()
-        return request.body
+        return request.content

diff --git a/httpcore/client.py b/httpcore/client.py
index 5f56281ae98ac69503acf41ebc7df0c52d8e6127..0e4e1c7d6759df74dd452b3bd17f698ac7213611 100644 (file)
--- a/httpcore/client.py
+++ b/httpcore/client.py
@@ -15,7 +15,7 @@ from .config import (
     TimeoutConfig,
 )
 from .dispatch.connection_pool import ConnectionPool
-from .models import URL, BodyTypes, HeaderTypes, Request, Response, URLTypes
+from .models import URL, ByteOrByteStream, HeaderTypes, Request, Response, URLTypes
 
 
 class Client:
@@ -39,14 +39,14 @@ class Client:
         method: str,
         url: URLTypes,
         *,
-        body: BodyTypes = b"",
+        content: ByteOrByteStream = b"",
         headers: HeaderTypes = None,
         stream: bool = False,
         allow_redirects: bool = True,
         ssl: SSLConfig = None,
         timeout: TimeoutConfig = None,
     ) -> Response:
-        request = Request(method, url, headers=headers, body=body)
+        request = Request(method, url, headers=headers, content=content)
         self.prepare_request(request)
         response = await self.send(
             request,
@@ -121,7 +121,7 @@ class Client:
         self,
         url: URLTypes,
         *,
-        body: BodyTypes = b"",
+        content: ByteOrByteStream = b"",
         headers: HeaderTypes = None,
         stream: bool = False,
         allow_redirects: bool = True,
@@ -131,7 +131,7 @@ class Client:
         return await self.request(
             "POST",
             url,
-            body=body,
+            content=content,
             headers=headers,
             stream=stream,
             allow_redirects=allow_redirects,
@@ -143,7 +143,7 @@ class Client:
         self,
         url: URLTypes,
         *,
-        body: BodyTypes = b"",
+        content: ByteOrByteStream = b"",
         headers: HeaderTypes = None,
         stream: bool = False,
         allow_redirects: bool = True,
@@ -153,7 +153,7 @@ class Client:
         return await self.request(
             "PUT",
             url,
-            body=body,
+            content=content,
             headers=headers,
             stream=stream,
             allow_redirects=allow_redirects,
@@ -165,7 +165,7 @@ class Client:
         self,
         url: URLTypes,
         *,
-        body: BodyTypes = b"",
+        content: ByteOrByteStream = b"",
         headers: HeaderTypes = None,
         stream: bool = False,
         allow_redirects: bool = True,
@@ -175,7 +175,7 @@ class Client:
         return await self.request(
             "PATCH",
             url,
-            body=body,
+            content=content,
             headers=headers,
             stream=stream,
             allow_redirects=allow_redirects,
@@ -187,7 +187,7 @@ class Client:
         self,
         url: URLTypes,
         *,
-        body: BodyTypes = b"",
+        content: ByteOrByteStream = b"",
         headers: HeaderTypes = None,
         stream: bool = False,
         allow_redirects: bool = True,
@@ -197,7 +197,7 @@ class Client:
         return await self.request(
             "DELETE",
             url,
-            body=body,
+            content=content,
             headers=headers,
             stream=stream,
             allow_redirects=allow_redirects,

diff --git a/httpcore/dispatch/http11.py b/httpcore/dispatch/http11.py
index d8e2740af81c73fdc421e5b38eed83d51ecfcb7d..f574c25618335cd96c52fb5e2c8c7f85e69adb58 100644 (file)
--- a/httpcore/dispatch/http11.py
+++ b/httpcore/dispatch/http11.py
@@ -78,14 +78,14 @@ class HTTP11Connection(Adapter):
         reason_phrase = event.reason.decode("latin1")
         status_code = event.status_code
         headers = event.headers
-        body = self._body_iter(timeout)
+        content = self._body_iter(timeout)
 
         response = Response(
             status_code=status_code,
             reason_phrase=reason_phrase,
             protocol="HTTP/1.1",
             headers=headers,
-            content=body,
+            content=content,
             on_close=self.response_closed,
             request=request,
         )

diff --git a/httpcore/dispatch/http2.py b/httpcore/dispatch/http2.py
index 4a63f90a60d48466706f57bfcc5303fbf6c5dd00..062e8f544554f25b01eb132ebead1a45a304d198 100644 (file)
--- a/httpcore/dispatch/http2.py
+++ b/httpcore/dispatch/http2.py
@@ -66,14 +66,14 @@ class HTTP2Connection(Adapter):
             elif not k.startswith(b":"):
                 headers.append((k, v))
 
-        body = self.body_iter(stream_id, timeout)
+        content = self.body_iter(stream_id, timeout)
         on_close = functools.partial(self.response_closed, stream_id=stream_id)
 
         response = Response(
             status_code=status_code,
             protocol="HTTP/2",
             headers=headers,
-            content=body,
+            content=content,
             on_close=on_close,
             request=request,
         )

diff --git a/httpcore/interfaces.py b/httpcore/interfaces.py
index d3cdca47dcd22929b2276a42167ab0005c0ee36c..644b19119d9153e5fdfdc23fab4aa9968de1942c 100644 (file)
--- a/httpcore/interfaces.py
+++ b/httpcore/interfaces.py
@@ -2,7 +2,7 @@ import typing
 from types import TracebackType
 
 from .config import TimeoutConfig
-from .models import URL, Request, Response
+from .models import URL, ByteOrByteStream, HeaderTypes, Request, Response, URLTypes
 
 OptionalTimeout = typing.Optional[TimeoutConfig]
 
@@ -11,13 +11,13 @@ class Adapter:
     async def request(
         self,
         method: str,
-        url: typing.Union[str, URL],
+        url: URLTypes,
         *,
-        headers: typing.List[typing.Tuple[bytes, bytes]] = [],
-        body: typing.Union[bytes, typing.AsyncIterator[bytes]] = b"",
+        headers: HeaderTypes = None,
+        content: ByteOrByteStream = b"",
         **options: typing.Any,
     ) -> Response:
-        request = Request(method, url, headers=headers, body=body)
+        request = Request(method, url, headers=headers, content=content)
         self.prepare_request(request)
         response = await self.send(request, **options)
         return response

diff --git a/httpcore/models.py b/httpcore/models.py
index b2837a1219af1522b9dc5fb54f33ee92671199c9..afc2d1ebc503c6bee28d1a9444e6116c62e574be 100644 (file)
--- a/httpcore/models.py
+++ b/httpcore/models.py
@@ -21,7 +21,7 @@ HeaderTypes = typing.Union[
     typing.List[typing.Tuple[typing.AnyStr, typing.AnyStr]],
 ]
 
-BodyTypes = typing.Union[bytes, typing.AsyncIterator[bytes]]
+ByteOrByteStream = typing.Union[bytes, typing.AsyncIterator[bytes]]
 
 
 class URL:
@@ -197,9 +197,7 @@ class Headers(typing.MutableMapping[str, str]):
         except KeyError:
             return default
 
-    def getlist(
-        self, key: str, split_commas: bool=False
-    ) -> typing.List[str]:
+    def getlist(self, key: str, split_commas: bool = False) -> typing.List[str]:
         """
         Return multiple header values.
 
@@ -320,35 +318,35 @@ class Request:
         url: typing.Union[str, URL],
         *,
         headers: HeaderTypes = None,
-        body: BodyTypes = b"",
+        content: ByteOrByteStream = b"",
     ):
         self.method = method.upper()
         self.url = URL(url) if isinstance(url, str) else url
-        if isinstance(body, bytes):
+        if isinstance(content, bytes):
             self.is_streaming = False
-            self.body = body
+            self.content = content
         else:
             self.is_streaming = True
-            self.body_aiter = body
+            self.content_aiter = content
         self.headers = Headers(headers)
 
     async def read(self) -> bytes:
         """
         Read and return the response content.
         """
-        if not hasattr(self, "body"):
-            body = b""
+        if not hasattr(self, "content"):
+            content = b""
             async for part in self.stream():
-                body += part
-            self.body = body
-        return self.body
+                content += part
+            self.content = content
+        return self.content
 
     async def stream(self) -> typing.AsyncIterator[bytes]:
         if self.is_streaming:
-            async for part in self.body_aiter:
+            async for part in self.content_aiter:
                 yield part
-        elif self.body:
-            yield self.body
+        elif self.content:
+            yield self.content
 
     def prepare(self) -> None:
         """
@@ -371,8 +369,8 @@ class Request:
         if not has_content_length:
             if self.is_streaming:
                 auto_headers.append((b"transfer-encoding", b"chunked"))
-            elif self.body:
-                content_length = str(len(self.body)).encode()
+            elif self.content:
+                content_length = str(len(self.content)).encode()
                 auto_headers.append((b"content-length", content_length))
         if not has_accept_encoding:
             auto_headers.append((b"accept-encoding", ACCEPT_ENCODING.encode()))
@@ -389,7 +387,7 @@ class Response:
         reason_phrase: str = None,
         protocol: str = None,
         headers: HeaderTypes = None,
-        content: BodyTypes = b"",
+        content: ByteOrByteStream = 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 4e44a1ee1fd7c36f99cdd1c0f8be6484a14955ad..574b6dc531f7e24a4bdf3fe25cbb526a76d61202 100644 (file)
--- a/tests/adapters/test_redirects.py
+++ b/tests/adapters/test_redirects.py
@@ -65,17 +65,17 @@ class MockDispatch(Adapter):
 
         elif request.url.path == "/cross_domain_target":
             headers = dict(request.headers.items())
-            body = json.dumps({"headers": headers}).encode()
-            return Response(codes.ok, content=body, request=request)
+            content = json.dumps({"headers": headers}).encode()
+            return Response(codes.ok, content=content, request=request)
 
         elif request.url.path == "/redirect_body":
-            body = await request.read()
+            await request.read()
             headers = {"location": "/redirect_body_target"}
             return Response(codes.permanent_redirect, headers=headers, request=request)
 
         elif request.url.path == "/redirect_body_target":
-            body = await request.read()
-            body = json.dumps({"body": body.decode()}).encode()
+            content = await request.read()
+            body = json.dumps({"body": content.decode()}).encode()
             return Response(codes.ok, content=body, request=request)
 
         return Response(codes.ok, content=b"Hello, world!", request=request)
@@ -222,8 +222,8 @@ async def test_same_domain_redirect():
 async def test_body_redirect():
     client = RedirectAdapter(MockDispatch())
     url = "https://example.org/redirect_body"
-    body = b"Example request body"
-    response = await client.request("POST", url, body=body)
+    content = b"Example request body"
+    response = await client.request("POST", url, content=content)
     data = json.loads(response.content.decode())
     assert response.url == URL("https://example.org/redirect_body_target")
     assert data == {"body": "Example request body"}
@@ -234,8 +234,8 @@ async def test_cannot_redirect_streaming_body():
     client = RedirectAdapter(MockDispatch())
     url = "https://example.org/redirect_body"
 
-    async def body():
+    async def streaming_body():
         yield b"Example request body"
 
     with pytest.raises(RedirectBodyUnavailable):
-        await client.request("POST", url, body=body())
+        await client.request("POST", url, content=streaming_body())

diff --git a/tests/dispatch/test_http2.py b/tests/dispatch/test_http2.py
index 7cc3ebbffd34d370937c13a13440b144cd307b01..4c7cabd176ee8fff1a9655f33d370f1535d95061 100644 (file)
--- a/tests/dispatch/test_http2.py
+++ b/tests/dispatch/test_http2.py
@@ -89,7 +89,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", body=b"<data>")
+        response = await conn.request("POST", "http://example.org", content=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 4df3529cd5b4b5a401bd4cbf7963fc5f6730abd7..eb0c3668c3f2b2296dd57d9785d115ae63080c9e 100644 (file)
--- a/tests/models/test_requests.py
+++ b/tests/models/test_requests.py
@@ -12,7 +12,7 @@ def test_host_header():
 
 
 def test_content_length_header():
-    request = httpcore.Request("POST", "http://example.org", body=b"test 123")
+    request = httpcore.Request("POST", "http://example.org", content=b"test 123")
     request.prepare()
     assert request.headers == httpcore.Headers(
         [
@@ -27,9 +27,9 @@ def test_transfer_encoding_header():
     async def streaming_body(data):
         yield data  # pragma: nocover
 
-    body = streaming_body(b"test 123")
+    content = streaming_body(b"test 123")
 
-    request = httpcore.Request("POST", "http://example.org", body=body)
+    request = httpcore.Request("POST", "http://example.org", content=content)
     request.prepare()
     assert request.headers == httpcore.Headers(
         [
@@ -64,10 +64,12 @@ def test_override_content_length_header():
     async def streaming_body(data):
         yield data  # pragma: nocover
 
-    body = streaming_body(b"test 123")
+    content = streaming_body(b"test 123")
     headers = [(b"content-length", b"8")]
 
-    request = httpcore.Request("POST", "http://example.org", body=body, headers=headers)
+    request = httpcore.Request(
+        "POST", "http://example.org", content=content, headers=headers
+    )
     request.prepare()
     assert request.headers == httpcore.Headers(
         [

diff --git a/tests/test_client.py b/tests/test_client.py
index 8933a83ea13fcf703c45a3ba887530b087fcdf99..4ec5744d9fb9c8dc730f1067c6fff5dd4e1fe068 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, body=b"Hello, world!")
+        response = await client.post(url, content=b"Hello, world!")
     assert response.status_code == 200
 
 
@@ -47,6 +47,6 @@ async def test_stream_request(server):
 
     async with httpcore.Client() as client:
         response = await client.request(
-            "POST", "http://127.0.0.1:8000/", body=hello_world()
+            "POST", "http://127.0.0.1:8000/", content=hello_world()
         )
     assert response.status_code == 200