Merge branch '19.12LTS' of github.com:huge-success/sanic into 19.12LTS

This commit is contained in:
Adam Hopkins 2020-10-25 14:32:42 +02:00
commit df4970a73d
3 changed files with 12 additions and 10 deletions

View File

@ -1 +1 @@
__version__ = "19.12.2" __version__ = "19.12.3"

View File

@ -22,6 +22,9 @@ except ImportError:
class BaseHTTPResponse: class BaseHTTPResponse:
def __init__(self):
self.asgi = False
def _encode_body(self, data): def _encode_body(self, data):
try: try:
# Try to encode it regularly # Try to encode it regularly
@ -59,6 +62,8 @@ class StreamingHTTPResponse(BaseHTTPResponse):
content_type="text/plain", content_type="text/plain",
chunked=True, chunked=True,
): ):
super().__init__()
self.content_type = content_type self.content_type = content_type
self.streaming_fn = streaming_fn self.streaming_fn = streaming_fn
self.status = status self.status = status
@ -146,6 +151,8 @@ class HTTPResponse(BaseHTTPResponse):
content_type=None, content_type=None,
body_bytes=b"", body_bytes=b"",
): ):
super().__init__()
self.content_type = content_type self.content_type = content_type
if body is not None: if body is not None:

View File

@ -5,7 +5,6 @@ import codecs
import os import os
import re import re
import sys import sys
from distutils.util import strtobool from distutils.util import strtobool
from setuptools import setup from setuptools import setup
@ -39,9 +38,7 @@ def open_local(paths, mode="r", encoding="utf8"):
with open_local(["sanic", "__version__.py"], encoding="latin1") as fp: with open_local(["sanic", "__version__.py"], encoding="latin1") as fp:
try: try:
version = re.findall( version = re.findall(r"^__version__ = \"([^']+)\"\r?$", fp.read(), re.M)[0]
r"^__version__ = \"([^']+)\"\r?$", fp.read(), re.M
)[0]
except IndexError: except IndexError:
raise RuntimeError("Unable to determine version.") raise RuntimeError("Unable to determine version.")
@ -71,9 +68,7 @@ setup_kwargs = {
], ],
} }
env_dependency = ( env_dependency = '; sys_platform != "win32" ' 'and implementation_name == "cpython"'
'; sys_platform != "win32" ' 'and implementation_name == "cpython"'
)
ujson = "ujson>=1.35" + env_dependency ujson = "ujson>=1.35" + env_dependency
uvloop = "uvloop>=0.5.3" + env_dependency uvloop = "uvloop>=0.5.3" + env_dependency
@ -83,13 +78,13 @@ requirements = [
ujson, ujson,
"aiofiles>=0.3.0", "aiofiles>=0.3.0",
"websockets>=7.0,<9.0", "websockets>=7.0,<9.0",
"multidict>=4.0,<5.0", "multidict==5.0.0",
"httpx==0.9.3", "httpx==0.9.3",
] ]
tests_require = [ tests_require = [
"pytest==5.2.1", "pytest==5.2.1",
"multidict>=4.0,<5.0", "multidict==5.0.0",
"gunicorn", "gunicorn",
"pytest-cov", "pytest-cov",
"httpcore==0.3.0", "httpcore==0.3.0",