Commit b7c8c29f authored by Stijn's avatar Stijn

Changed type of payload of TextMessage from str to unicode

parent ce7c679d
...@@ -22,8 +22,10 @@ class Message(object): ...@@ -22,8 +22,10 @@ class Message(object):
class TextMessage(Message): class TextMessage(Message):
def __init__(self, payload): def __init__(self, payload):
text = str(payload).encode('utf-8') super(TextMessage, self).__init__(OPCODE_TEXT, unicode(payload))
super(TextMessage, self).__init__(OPCODE_TEXT, text)
def frame(self, mask=False):
return Frame(self.opcode, self.payload.encode('utf-8'), mask=mask)
def __str__(self): def __str__(self):
if len(self.payload) > 30: if len(self.payload) > 30:
...@@ -35,12 +37,12 @@ class TextMessage(Message): ...@@ -35,12 +37,12 @@ class TextMessage(Message):
class BinaryMessage(Message): class BinaryMessage(Message):
def __init__(self, payload): def __init__(self, payload):
super(BinaryMessage, self).__init__(OPCODE_BINARY, payload) super(BinaryMessage, self).__init__(OPCODE_BINARY, bytearray(payload))
def create_message(opcode, payload): def create_message(opcode, payload):
if opcode == OPCODE_TEXT: if opcode == OPCODE_TEXT:
return TextMessage(payload) return TextMessage(payload.decode('utf-8'))
if opcode == OPCODE_BINARY: if opcode == OPCODE_BINARY:
return BinaryMessage(payload) return BinaryMessage(payload)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment