Vasanko/sanic
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove StreamingHTTPResponse.get_headers helper function.

Browse Source
This commit is contained in:
L. Kärkkäinen 2020-01-15 11:27:26 +02:00
parent 7704814019
commit 9651e6ae01
1 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sanic/response.py
View File

@ -80,14 +80,22 @@ class StreamingHTTPResponse(BaseHTTPResponse):
"""Streams headers, runs the `streaming_fn` callback that writes """Streams headers, runs the `streaming_fn` callback that writes
content to the response body, then finalizes the response body. content to the response body, then finalizes the response body.
""" """
if version != "1.1": assert version == "1.1", "No other versions are currently supported"
self.chunked = False
headers = self.get_headers( if keep_alive and keep_alive_timeout:
version, self.headers["Keep-Alive"] = keep_alive_timeout
keep_alive=keep_alive,
keep_alive_timeout=keep_alive_timeout, # self.headers get priority over content_type
if self.content_type and "Content-Type" not in self.headers:
self.headers["Content-Type"] = self.content_type
if self.chunked:
self.headers["Transfer-Encoding"] = "chunked"
self.headers.pop("Content-Length", None)
await self.protocol.push_data(
format_http1_response(self.status, self.headers.items())
) )
await self.protocol.push_data(headers)
await self.protocol.drain() await self.protocol.drain()
await self.streaming_fn(self) await self.streaming_fn(self)
if self.chunked: if self.chunked:
@ -95,24 +103,6 @@ class StreamingHTTPResponse(BaseHTTPResponse):
# no need to await drain here after this write, because it is the # no need to await drain here after this write, because it is the
# very last thing we write and nothing needs to wait for it. # very last thing we write and nothing needs to wait for it.
def get_headers(
self, version="1.1", keep_alive=False, keep_alive_timeout=None
):
assert version == "1.1", "No other versions are currently supported"
# self.headers get priority over content_type
if self.content_type and "Content-Type" not in self.headers:
self.headers["Content-Type"] = self.content_type
if keep_alive and keep_alive_timeout is not None:
self.headers["Keep-Alive"] = keep_alive_timeout
if self.chunked and version == "1.1":
self.headers["Transfer-Encoding"] = "chunked"
self.headers.pop("Content-Length", None)
return format_http1_response(self.status, self.headers.items())
class HTTPResponse(BaseHTTPResponse): class HTTPResponse(BaseHTTPResponse):
__slots__ = ("body", "status", "content_type", "headers", "_cookies") __slots__ = ("body", "status", "content_type", "headers", "_cookies")