Skip to content

Commit e657dee

Browse files
author
chenyan
committed
adapt ci case for py2
1 parent 0ed0b7e commit e657dee

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

websocket_server/websocket_server.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,10 @@ def __init__(self, port, host='127.0.0.1', loglevel=logging.WARNING):
124124
self.port = self.socket.getsockname()[1]
125125

126126
def _message_received_(self, handler, msg):
127-
self.message_received(self.handler_to_client(handler), self, msg.decode())
127+
self.message_received(self.handler_to_client(handler), self, msg)
128128

129129
def _ping_received_(self, handler, msg):
130-
handler.send_pong(msg.decode())
130+
handler.send_pong(msg)
131131

132132
def _pong_received_(self, handler, msg):
133133
pass
@@ -233,11 +233,11 @@ def read_next_message(self):
233233

234234
if fin and opcode != OPCODE_CONTINUATION: # simple msg
235235
if opcode == OPCODE_PING:
236-
self.server._ping_received_(self, payload)
236+
self.server._ping_received_(self, payload.decode('utf8'))
237237
elif opcode == OPCODE_PONG:
238-
self.server._pong_received_(self, payload)
238+
self.server._pong_received_(self, payload.decode('utf8'))
239239
elif opcode == OPCODE_TEXT:
240-
self.server._message_received_(self, payload)
240+
self.server._message_received_(self, payload.decode('utf8'))
241241
return
242242

243243
if not fin and opcode: # fragment msg start
@@ -252,7 +252,7 @@ def read_next_message(self):
252252

253253
if fin and opcode == OPCODE_CONTINUATION: # fragment msg end
254254
if self.fragment_opcode == OPCODE_TEXT:
255-
self.server._message_received_(self, self.fragment_payload_buf + payload)
255+
self.server._message_received_(self, (self.fragment_payload_buf + payload).decode('utf8'))
256256
elif self.fragment_opcode == OPCODE_BINARY:
257257
pass
258258
return

0 commit comments

Comments
 (0)