summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliris <liris.pp@gmail.com>2014-06-06 10:38:41 +0900
committerliris <liris.pp@gmail.com>2014-06-06 10:38:41 +0900
commit2971cb4ad06cc37a223766756e94b604d78d9d6a (patch)
tree28c72c56b64e0e365de3adae4d577c677866dc4c
parentf57811d0428e5c1d93d51c9055d140662b6086c7 (diff)
downloadwebsocket-client-2971cb4ad06cc37a223766756e94b604d78d9d6a.tar.gz
- fixed #49
-rw-r--r--websocket/_core.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/websocket/_core.py b/websocket/_core.py
index 189e052..8e43cf3 100644
--- a/websocket/_core.py
+++ b/websocket/_core.py
@@ -593,6 +593,8 @@ class WebSocket(object):
payload: data payload to send server.
"""
+ if isinstance(payload, six.text_type):
+ payload = payload.encode("utf-8")
self.send(payload, ABNF.OPCODE_PING)
def pong(self, payload):
@@ -601,6 +603,8 @@ class WebSocket(object):
payload: data payload to send server.
"""
+ if isinstance(payload, six.text_type):
+ payload = payload.encode("utf-8")
self.send(payload, ABNF.OPCODE_PONG)
def recv(self):
@@ -723,7 +727,7 @@ class WebSocket(object):
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.
@@ -735,7 +739,7 @@ class WebSocket(object):
raise ValueError("code is invalid range")
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