Merge branch 'master' into 0.4.2.1

docs/settings.md

@@ -87,10 +87,10 @@ These settings are available  from ```window.swampdragon_settings```.
     </script>
 
 
-If you want to access the url for your SwampDragon instance from JavaScript, you can do so with ```window.swamp_dargon_host```.
+If you want to access the url for your SwampDragon instance from JavaScript, you can do so with ```window.swamp_dragon_host```.
 
     <script>
         // ouput http://localhost:9999 assuming you are running your server on that url
-        console.log(window.swamp_dargon_host); 
+        console.log(window.swamp_dragon_host); 
     </script>
 

swampdragon/pubsub_providers/model_publisher.py

@@ -27,5 +27,6 @@ def publish_model(model_instance, serializer, action, changed_fields=None):
         publish_data = {'data': {'id': model_instance.pk}}
         publish_data['action'] = PUBACTIONS.deleted
         for channel in remove_from_channels:
+            publish_data['channel'] = channel
             publisher.publish(channel, publish_data)
             publish_data['channel'] = channel

tests/test_same_origin.py

@@ -1,4 +1,8 @@
-from http.cookies import SimpleCookie
+try:
+    from http.cookies import SimpleCookie
+except ImportError:
+    from Cookie import SimpleCookie
+
 from django.conf import settings
 from sockjs.tornado.session import ConnectionInfo
 from swampdragon.connections.sockjs_connection import SubscriberConnection