openstack/deb-python-websocket-client
Code Issues Proposed changes

- fixed #49

Browse Source
This commit is contained in:
liris
2014-06-06 10:38:41 +09:00
parent f57811d042
commit 2971cb4ad0
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
websocket/_core.py
View File

@@ -593,6 +593,8 @@ class WebSocket(object):
payload: data payload to send server. payload: data payload to send server.
""" """
if isinstance(payload, six.text_type):
payload = payload.encode("utf-8")
self.send(payload, ABNF.OPCODE_PING) self.send(payload, ABNF.OPCODE_PING)
def pong(self, payload): def pong(self, payload):
@@ -601,6 +603,8 @@ class WebSocket(object):
payload: data payload to send server. payload: data payload to send server.
""" """
if isinstance(payload, six.text_type):
payload = payload.encode("utf-8")
self.send(payload, ABNF.OPCODE_PONG) self.send(payload, ABNF.OPCODE_PONG)
def recv(self): def recv(self):
@@ -723,7 +727,7 @@ class WebSocket(object):
return ABNF(fin, rsv1, rsv2, rsv3, opcode, has_mask, payload) return ABNF(fin, rsv1, rsv2, rsv3, opcode, has_mask, payload)
def send_close(self, status=STATUS_NORMAL, reason=b""): def send_close(self, status=STATUS_NORMAL, reason=six.b("")):
""" """
send close data to the server. send close data to the server.
@@ -735,7 +739,7 @@ class WebSocket(object):
raise ValueError("code is invalid range") raise ValueError("code is invalid range")
self.send(struct.pack('!H', status) + reason, ABNF.OPCODE_CLOSE) self.send(struct.pack('!H', status) + reason, ABNF.OPCODE_CLOSE)
def close(self, status=STATUS_NORMAL, reason=""): def close(self, status=STATUS_NORMAL, reason=six.b("")):
""" """
Close Websocket object Close Websocket object