Merge pull request #273 from the-kid89/fix_272

Fixed issue 272
This commit is contained in:
Andrew Godwin 2016-07-27 16:25:18 +01:00 committed by GitHub
commit b4263d0f1b
2 changed files with 3 additions and 3 deletions

View File

@ -1,4 +1,4 @@
import json
from django.core.serializers.json import json, DjangoJSONEncoder
from ..channel import Group, Channel
from ..auth import channel_session_user_from_http
@ -222,4 +222,4 @@ class WebsocketDemultiplexer(JsonWebsocketConsumer):
return {"text": json.dumps({
"stream": stream,
"payload": payload,
})}
}, cls=DjangoJSONEncoder)}

View File

@ -18,7 +18,7 @@ deps =
six
redis==2.10.5
py27: mock
flake8: flake8
flake8: flake8>=2.0,<3.0
isort: isort
django-18: Django>=1.8,<1.9
django-19: Django>=1.9,<1.10