From 8327aac63386d0d790e5980c41b66dde0cbe47b7 Mon Sep 17 00:00:00 2001 From: Tyson Clugg Date: Wed, 27 May 2015 15:16:07 +1000 Subject: [PATCH] Use OrderedDict for geventwebsocket.Resource spec so geventwebsockets>=0.9.4 doesn't complain. --- dddp/main.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dddp/main.py b/dddp/main.py index a9abfdc..2b0f863 100644 --- a/dddp/main.py +++ b/dddp/main.py @@ -88,13 +88,15 @@ def serve(listen, debug=False, **ssl_args): wsgi_app = get_wsgi_application() wsgi_name = str(wsgi_app.__class__) - resource = geventwebsocket.Resource({ - r'/websocket': DDPWebSocketApplication, - r'^/sockjs/\d+/\w+/websocket$': DDPWebSocketApplication, - r'^/sockjs/\d+/\w+/xhr$': ddpp_sockjs_xhr, - r'^/sockjs/info$': ddpp_sockjs_info, - r'^/(?!(websocket|sockjs)/)': wsgi_app, - }) + resource = geventwebsocket.Resource( + collections.OrderedDict([ + (r'/websocket', DDPWebSocketApplication), + (r'^/sockjs/\d+/\w+/websocket$', DDPWebSocketApplication), + (r'^/sockjs/\d+/\w+/xhr$', ddpp_sockjs_xhr), + (r'^/sockjs/info$', ddpp_sockjs_info), + (r'^/(?!(websocket|sockjs)/)', wsgi_app), + ]), + ) # setup WebSocketServer to dispatch web requests webservers = [