Merge branch 'master' of https://github.com/Lawouach/WebSocket-for-Python

progrium · progrium · commit e3ebfcfac7b6 · 2011-09-21T15:41:58.000-07:00
diff --git a/ws4py/client/__init__.py b/ws4py/client/__init__.py
@@ -4,6 +4,7 @@
 import os
 import types
 from urlparse import urlsplit
+import json
 
 from ws4py import WS_KEY
 from ws4py.streaming import Stream
@@ -125,7 +126,10 @@ def send(self, payload, binary=False):
                 self.write_to_connection(self.stream.text_message(payload).single(mask=True))
             else:
                 self.write_to_connection(self.stream.binary_message(payload).single(mask=True))
-                
+        
+        elif isinstance(payload, dict):
+            self.write_to_connection(self.stream.text_message(json.dumps(payload)).single(mask=True))
+        
         elif type(payload) == types.GeneratorType:
             bytes = payload.next()
             first = True
