Jeffrey Gelens avatar Jeffrey Gelens committed 74c46ee

Fixed #5 Encoding issue when sending non-ascii message.
Thanks gdamjan and Juanlu001.

Comments (0)

Files changed (1)

geventwebsocket/websocket.py

         self.fobj = fobj
         self._write = _get_write(fobj)
 
+    def _encode_text(self, s):
+        if isinstance(s, unicode):
+            return s.encode('utf-8')
+        elif isinstance(s, str):
+            return unicode(s).encode('utf-8')
+        else:
+            raise Exception('Invalid encoding')
+
     def send(self, message):
-        if isinstance(message, unicode):
-            message = message.encode('utf-8')
-        elif isinstance(message, str):
-            message = unicode(message, 'utf-8').encode('utf-8')
-        else:
-            raise TypeError("Invalid message encoding")
+        message = self._encode_text(message)
 
         with self._writelock:
             self._write("\x00" + message + "\xFF")
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.