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

Rename the http module to helpers to prevent conflicts with the built-in Python http library (fixes #1323)

Browse Source
This commit is contained in:
Igor Hatarist 2018-09-25 20:46:40 +03:00
parent 04b8dd989f
commit f8a6af1e28
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sanic/exceptions.py
View File

@ -1,4 +1,4 @@
from sanic.http import STATUS_CODES from sanic.helpers import STATUS_CODES
TRACEBACK_STYLE = ''' TRACEBACK_STYLE = '''
<style> <style>

0
sanic/http.py → sanic/helpers.py
View File

10
sanic/response.py
View File

@ -10,7 +10,7 @@ except BaseException:
from aiofiles import open as open_async from aiofiles import open as open_async
from multidict import CIMultiDict from multidict import CIMultiDict
from sanic import http from sanic.helpers import STATUS_CODES, has_message_body, remove_entity_headers
from sanic.cookies import CookieJar from sanic.cookies import CookieJar
@ -103,7 +103,7 @@ class StreamingHTTPResponse(BaseHTTPResponse):
if self.status is 200: if self.status is 200:
status = b'OK' status = b'OK'
else: else:
status = http.STATUS_CODES.get(self.status) status = STATUS_CODES.get(self.status)
return (b'HTTP/%b %d %b\r\n' return (b'HTTP/%b %d %b\r\n'
b'%b' b'%b'
@ -141,7 +141,7 @@ class HTTPResponse(BaseHTTPResponse):
timeout_header = b'Keep-Alive: %d\r\n' % keep_alive_timeout timeout_header = b'Keep-Alive: %d\r\n' % keep_alive_timeout
body = b'' body = b''
if http.has_message_body(self.status): if has_message_body(self.status):
body = self.body body = self.body
self.headers['Content-Length'] = self.headers.get( self.headers['Content-Length'] = self.headers.get(
'Content-Length', len(self.body)) 'Content-Length', len(self.body))
@ -150,14 +150,14 @@ class HTTPResponse(BaseHTTPResponse):
'Content-Type', self.content_type) 'Content-Type', self.content_type)
if self.status in (304, 412): if self.status in (304, 412):
self.headers = http.remove_entity_headers(self.headers) self.headers = remove_entity_headers(self.headers)
headers = self._parse_headers() headers = self._parse_headers()
if self.status is 200: if self.status is 200:
status = b'OK' status = b'OK'
else: else:
status = http.STATUS_CODES.get(self.status, b'UNKNOWN RESPONSE') status = STATUS_CODES.get(self.status, b'UNKNOWN RESPONSE')
return (b'HTTP/%b %d %b\r\n' return (b'HTTP/%b %d %b\r\n'
b'Connection: %b\r\n' b'Connection: %b\r\n'