Skip to content

Commit

Permalink
adapt ci case for py2
Browse files Browse the repository at this point in the history
  • Loading branch information
chenyan committed Apr 8, 2019
1 parent 0ed0b7e commit e657dee
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions websocket_server/websocket_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@ def __init__(self, port, host='127.0.0.1', loglevel=logging.WARNING):
self.port = self.socket.getsockname()[1]

def _message_received_(self, handler, msg):
self.message_received(self.handler_to_client(handler), self, msg.decode())
self.message_received(self.handler_to_client(handler), self, msg)

def _ping_received_(self, handler, msg):
handler.send_pong(msg.decode())
handler.send_pong(msg)

def _pong_received_(self, handler, msg):
pass
Expand Down Expand Up @@ -233,11 +233,11 @@ def read_next_message(self):

if fin and opcode != OPCODE_CONTINUATION: # simple msg
if opcode == OPCODE_PING:
self.server._ping_received_(self, payload)
self.server._ping_received_(self, payload.decode('utf8'))
elif opcode == OPCODE_PONG:
self.server._pong_received_(self, payload)
self.server._pong_received_(self, payload.decode('utf8'))
elif opcode == OPCODE_TEXT:
self.server._message_received_(self, payload)
self.server._message_received_(self, payload.decode('utf8'))
return

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

if fin and opcode == OPCODE_CONTINUATION: # fragment msg end
if self.fragment_opcode == OPCODE_TEXT:
self.server._message_received_(self, self.fragment_payload_buf + payload)
self.server._message_received_(self, (self.fragment_payload_buf + payload).decode('utf8'))
elif self.fragment_opcode == OPCODE_BINARY:
pass
return
Expand Down

0 comments on commit e657dee

Please sign in to comment.