mirror of
https://github.com/django/daphne.git
synced 2025-04-21 01:02:06 +03:00
hawkie fixes
This commit is contained in:
parent
8492dcde48
commit
9d86aaad34
|
@ -8,10 +8,10 @@ def encode_request(request):
|
|||
"""
|
||||
# TODO: More stuff
|
||||
value = {
|
||||
"GET": request.GET.items(),
|
||||
"POST": request.POST.items(),
|
||||
"GET": list(request.GET.items()),
|
||||
"POST": list(request.POST.items()),
|
||||
"COOKIES": request.COOKIES,
|
||||
"META": {k: v for k, v in request.META.items() if not k.startswith("wsgi")},
|
||||
"META": dict({k: v for k, v in request.META.items() if not k.startswith("wsgi")}),
|
||||
"path": request.path,
|
||||
"path_info": request.path_info,
|
||||
"method": request.method,
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
from django.http import HttpResponse
|
||||
from six import PY3
|
||||
|
||||
|
||||
def encode_response(response):
|
||||
|
@ -10,8 +11,10 @@ def encode_response(response):
|
|||
"content_type": getattr(response, "content_type", None),
|
||||
"content": response.content,
|
||||
"status_code": response.status_code,
|
||||
"headers": response._headers.values(),
|
||||
"headers": list(response._headers.values()),
|
||||
}
|
||||
if PY3:
|
||||
value["content"] = value["content"].decode('utf8')
|
||||
response.close()
|
||||
return value
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
import types
|
||||
from django.apps import apps
|
||||
|
||||
from six import PY3
|
||||
|
||||
def auto_import_consumers():
|
||||
"""
|
||||
|
@ -12,8 +13,13 @@ def auto_import_consumers():
|
|||
try:
|
||||
__import__(module_name)
|
||||
except ImportError as e:
|
||||
if "no module named %s" % submodule not in str(e).lower():
|
||||
raise
|
||||
err = str(e).lower()
|
||||
if PY3:
|
||||
if "no module named '%s'" % (module_name,) not in err:
|
||||
raise
|
||||
else:
|
||||
if "no module named %s" % (submodule,) not in err:
|
||||
raise
|
||||
|
||||
|
||||
def name_that_thing(thing):
|
||||
|
|
|
@ -27,7 +27,7 @@ app, and put this in a ``consumers.py`` file in the app::
|
|||
@consumer("django.wsgi.request")
|
||||
def http_consumer(response_channel, path, **kwargs):
|
||||
response = HttpResponse("Hello world! You asked for %s" % path)
|
||||
Channel(response_channel).send(response.channel_encode())
|
||||
Channel(response_channel).send(**response.channel_encode())
|
||||
|
||||
The most important thing to note here is that, because things we send in
|
||||
messages must be JSON-serialisable, the request and response messages
|
||||
|
|
Loading…
Reference in New Issue
Block a user