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

Also normalise include patterns, and add tests for all regex norm

Browse Source
This commit is contained in:
Andrew Godwin 2016-03-22 10:39:27 -07:00
parent 7864519241
commit 8a65199bfe
2 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
channels/routing.py
View File

@ -205,7 +205,10 @@ class Include(object):
def __init__(self, routing, **kwargs):
self.routing = Router.resolve_routing(routing)
self.prefixes = kwargs
self.prefixes = {
name: Router.normalise_re_arg(value)
for name, value in kwargs.items()
}
# Sanity check prefix regexes
for name, value in self.prefixes.items():
if not value.startswith("^"):

54
channels/tests/test_routing.py
View File

@ -230,3 +230,57 @@ class RoutingTests(SimpleTestCase):
Router([
include("channels.tests.test_routing.chatroom_routing_noprefix", path="^/foobar/"),
])
def test_mixed_unicode_bytes(self):
"""
Tests that having the message key be bytes and pattern unicode (or vice-versa)
still works.
"""
# Unicode patterns, byte message
router = Router([
route("websocket.connect", consumer_1, path="^/foo/"),
include("channels.tests.test_routing.chatroom_routing", path="^/ws/v(?P<version>[0-9]+)"),
])
self.assertRoute(
router,
channel="websocket.connect",
content={"path": b"/boom/"},
consumer=None,
)
self.assertRoute(
router,
channel="websocket.connect",
content={"path": b"/foo/"},
consumer=consumer_1,
)
self.assertRoute(
router,
channel="websocket.connect",
content={"path": b"/ws/v2/chat/django/"},
consumer=consumer_2,
kwargs={"version": "2", "room": "django"},
)
# Byte patterns, unicode message
router = Router([
route("websocket.connect", consumer_1, path=b"^/foo/"),
include("channels.tests.test_routing.chatroom_routing", path=b"^/ws/v(?P<version>[0-9]+)"),
])
self.assertRoute(
router,
channel="websocket.connect",
content={"path": "/boom/"},
consumer=None,
)
self.assertRoute(
router,
channel="websocket.connect",
content={"path": "/foo/"},
consumer=consumer_1,
)
self.assertRoute(
router,
channel="websocket.connect",
content={"path": "/ws/v2/chat/django/"},
consumer=consumer_2,
kwargs={"version": "2", "room": "django"},
)