django/daphne
1
1
Fork 0
mirror of https://github.com/django/daphne.git synced 2025-04-22 09:42:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix request/response compatability

Browse Source
This commit is contained in:
Andrew Godwin 2015-09-07 15:04:10 -05:00
parent 4c65ad4c09
commit 9b92eec43a
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
channels/request.py
View File

@ -1,5 +1,7 @@
from django.http import HttpRequest
from django.utils.datastructures import MultiValueDict
from django.http.request import QueryDict
from django.conf import settings
def encode_request(request):
@ -25,8 +27,8 @@ def decode_request(value):
Decodes a request JSONish value to a HttpRequest object.
"""
request = HttpRequest()
request.GET = MultiValueDict(value['GET'])
request.POST = MultiValueDict(value['POST'])
request.GET = CustomQueryDict(value['GET'])
request.POST = CustomQueryDict(value['POST'])
request.COOKIES = value['COOKIES']
request.META = value['META']
request.path = value['path']
@ -34,3 +36,12 @@ def decode_request(value):
request.path_info = value['path_info']
request.response_channel = value['response_channel']
return request
class CustomQueryDict(QueryDict):
"""
Custom override of QueryDict that sets things directly.
"""
def __init__(self, values):
MultiValueDict.__init__(self, values)

5
channels/response.py
View File

@ -1,4 +1,5 @@
from django.http import HttpResponse
from django.http.cookie import SimpleCookie
from six import PY3
@ -6,12 +7,12 @@ def encode_response(response):
"""
Encodes a response to JSON-compatible datastructures
"""
# TODO: Entirely useful things like cookies
value = {
"content_type": getattr(response, "content_type", None),
"content": response.content,
"status_code": response.status_code,
"headers": list(response._headers.values()),
"cookies": {k: v.output(header="") for k, v in response.cookies.items()}
}
if PY3:
value["content"] = value["content"].decode('utf8')
@ -28,6 +29,8 @@ def decode_response(value):
content_type = value['content_type'],
status = value['status_code'],
)
for cookie in value['cookies'].values():
response.cookies.load(cookie)
response._headers = {k.lower: (k, v) for k, v in value['headers']}
return response