From 8327aac63386d0d790e5980c41b66dde0cbe47b7 Mon Sep 17 00:00:00 2001
From: Tyson Clugg <tyson@clugg.net>
Date: Wed, 27 May 2015 15:16:07 +1000
Subject: [PATCH 1/2] 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 = [

From 297188d589da2316ceea5d10f7fc546f3fbb606f Mon Sep 17 00:00:00 2001
From: Tyson Clugg <tyson@clugg.net>
Date: Wed, 27 May 2015 15:19:38 +1000
Subject: [PATCH 2/2] Bump version number, update CHANGES.rst.

---
 CHANGES.rst | 5 +++++
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index c8fc847..b5908cc 100644
--- a/CHANGES.rst
+++ b/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.
diff --git a/setup.py b/setup.py
index abf7dfd..07a87fc 100644
--- a/setup.py
+++ b/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',