Fix Autobahn WebSocket vs. Python 3

Fixes #448
RobotWebTools · Jan 2, 2020 · 54b7390 · 54b7390
1 parent 4fe386b
commit 54b7390
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/rosbridge_server/src/rosbridge_server/autobahn_websocket.py b/rosbridge_server/src/rosbridge_server/autobahn_websocket.py
@@ -150,6 +150,8 @@ def onOpen(self):
 
     def onMessage(self, message, binary):
         cls = self.__class__
+        if not binary:
+            message = message.decode('utf-8')
         # check if we need to authenticate
         if cls.authenticate and not self.authenticated:
             try:
@@ -188,6 +190,7 @@ def outgoing(self, message):
             message = bytes(message)
         else:
             binary = False
+            message = message.encode('utf-8')
 
         self.sendMessage(message, binary)
 

diff --git a/rosbridge_server/test/websocket/test_smoke.py b/rosbridge_server/test/websocket/test_smoke.py
@@ -50,7 +50,7 @@ def onOpen(self):
         }, NUM_MSGS)
 
     def _sendDict(self, msg_dict, times=1):
-        msg = json.dumps(msg_dict)
+        msg = json.dumps(msg_dict).encode('utf-8')
         for _ in range(times):
             self.sendMessage(msg)