Drop prepare_request

This commit is contained in:
Tom Christie 2019-05-24 13:40:04 +01:00
parent 1970912c41
commit 37da9ed26a
3 changed files with 2 additions and 19 deletions

View File

@ -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,

View File

@ -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,

View File

@ -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