Skip to content

Commit f4a5aa5

Browse files
author
Max Mikhaylov
authored
Fixed message validation for Python 3
Added short-circuit that prevents checking if message is `unicode`, if Python version is 3.0 or higher. There is no `unicode` keyword in Python 3 since all strings are sequences of Unicode characters.
1 parent b4c3fe2 commit f4a5aa5

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

websocket_server/websocket_server.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,9 @@ def send_text(self, message, opcode=OPCODE_TEXT):
257257
if not message:
258258
logger.warning("Can\'t send message, message is not valid UTF-8")
259259
return False
260-
elif isinstance(message, str) or isinstance(message, unicode):
260+
elif sys.version_info < (3,0) and (isinstance(message, str) or isinstance(message, unicode)):
261+
pass
262+
elif isinstance(message, str):
261263
pass
262264
else:
263265
logger.warning('Can\'t send message, message has to be a string or bytes. Given type is %s' % type(message))

0 commit comments

Comments
 (0)