Merge branch 'release/0.6.5'

CHANGES.rst

@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+0.6.5
+-----
+* Use OrderedDict for geventwebsocket.Resource spec to support
+  geventwebsockets 0.9.4 and above.
+
 0.6.4
 -----
 * Send `removed` messages when client unsubscribes from publications.

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 = [

setup.py

@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='django-ddp',
-    version='0.6.4',
+    version='0.6.5',
     description=__doc__,
     long_description=open('README.rst').read(),
     author='Tyson Clugg',