Merge branch 'fix-ws-recv' of https://github.com/bernardcooke53/stomp.py

into bernardcooke53-fix-ws-recv
jasonrbriggs · Jun 6, 2023 · 69e0a6f · 69e0a6f
2 parents 9b414bb + fee271b
commit 69e0a6f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/stomp/adapter/ws.py b/stomp/adapter/ws.py
@@ -212,7 +212,8 @@ def receive(self):
         :rtype: bytes
         """
         try:
-            return self.socket.recv().encode()
+            ret = self.socket.recv()
+            return ret.encode() if type(ret) == str else ret
         except socket.error:
             _, e, _ = sys.exc_info()
             if get_errno(e) in (errno.EAGAIN, errno.EINTR):