From: Tom Christie <tom@tomchristie.com>
Date: Fri, 24 May 2019 12:40:04 +0000 (+0100)
Subject: Drop prepare_request
X-Git-Tag: 0.3.1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37da9ed26aebca9a05cfd10ed8946d0f27397cc3;p=thirdparty%2Fhttpx.git

Drop prepare_request
---

diff --git a/httpcore/client.py b/httpcore/client.py
index 39fa0aa5..2946a753 100644
--- a/httpcore/client.py
+++ b/httpcore/client.py
@@ -297,7 +297,6 @@ class AsyncClient:
             headers=headers,
             cookies=self.merge_cookies(cookies),
         )
-        self.prepare_request(request)
         response = await self.send(
             request,
             stream=stream,
@@ -309,9 +308,6 @@ class AsyncClient:
         )
         return response
 
-    def prepare_request(self, request: Request) -> None:
-        request.prepare()
-
     def merge_cookies(
         self, cookies: CookieTypes = None
     ) -> typing.Optional[CookieTypes]:
@@ -549,7 +545,6 @@ class Client:
             headers=headers,
             cookies=self._client.merge_cookies(cookies),
         )
-        self.prepare_request(request)
         response = self.send(
             request,
             stream=stream,
@@ -766,9 +761,6 @@ class Client:
             timeout=timeout,
         )
 
-    def prepare_request(self, request: Request) -> None:
-        self._client.prepare_request(request)
-
     def send(
         self,
         request: Request,
diff --git a/httpcore/interfaces.py b/httpcore/interfaces.py
index f2e846be..42ffd157 100644
--- a/httpcore/interfaces.py
+++ b/httpcore/interfaces.py
@@ -44,15 +44,11 @@ class Dispatcher:
         timeout: TimeoutTypes = None
     ) -> Response:
         request = Request(method, url, data=data, params=params, headers=headers)
-        self.prepare_request(request)
         response = await self.send(
             request, stream=stream, verify=verify, cert=cert, timeout=timeout
         )
         return response
 
-    def prepare_request(self, request: Request) -> None:
-        request.prepare()
-
     async def send(
         self,
         request: Request,
diff --git a/httpcore/models.py b/httpcore/models.py
index f2bc9356..f8c10847 100644
--- a/httpcore/models.py
+++ b/httpcore/models.py
@@ -503,6 +503,8 @@ class Request:
             self.is_streaming = True
             self.content_aiter = data
 
+        self.prepare()
+
     async def read(self) -> bytes:
         """
         Read and return the response content.
@@ -519,13 +521,6 @@ class Request:
             yield self.content
 
     def prepare(self) -> None:
-        """
-        Adds in any default headers. When using the `Client`, this will
-        end up being called into by the `prepare_request()` stage.
-
-        You can omit this behavior by calling `Client.send()` with an
-        explicitly built `Request` instance.
-        """
         auto_headers = []  # type: typing.List[typing.Tuple[bytes, bytes]]
 
         has_host = "host" in self.headers