diff options
Diffstat (limited to 'netlib/websockets')
| -rw-r--r-- | netlib/websockets/frame.py | 14 | ||||
| -rw-r--r-- | netlib/websockets/masker.py | 7 |
2 files changed, 3 insertions, 18 deletions
diff --git a/netlib/websockets/frame.py b/netlib/websockets/frame.py index e62d0e87..2b36d461 100644 --- a/netlib/websockets/frame.py +++ b/netlib/websockets/frame.py @@ -3,8 +3,6 @@ import os import struct import io -import six - from netlib import tcp from netlib import strutils from netlib import utils @@ -129,7 +127,7 @@ class FrameHeader(object): second_byte = utils.setbit(self.length_code, 7, self.mask) - b = six.int2byte(first_byte) + six.int2byte(second_byte) + b = bytes([first_byte, second_byte]) if self.payload_length < 126: pass @@ -148,17 +146,12 @@ class FrameHeader(object): b += self.masking_key return b - if six.PY2: - __str__ = __bytes__ - @classmethod def from_file(cls, fp): """ read a websockets frame header """ - first_byte = six.byte2int(fp.safe_read(1)) - second_byte = six.byte2int(fp.safe_read(1)) - + first_byte, second_byte = fp.safe_read(2) fin = utils.getbit(first_byte, 7) rsv1 = utils.getbit(first_byte, 6) rsv2 = utils.getbit(first_byte, 5) @@ -257,9 +250,6 @@ class Frame(object): b += self.payload return b - if six.PY2: - __str__ = __bytes__ - @classmethod def from_file(cls, fp): """ diff --git a/netlib/websockets/masker.py b/netlib/websockets/masker.py index bd39ed6a..03b8f435 100644 --- a/netlib/websockets/masker.py +++ b/netlib/websockets/masker.py @@ -1,7 +1,5 @@ from __future__ import absolute_import -import six - class Masker(object): """ @@ -19,10 +17,7 @@ class Masker(object): def mask(self, offset, data): result = bytearray(data) for i in range(len(data)): - if six.PY2: - result[i] ^= ord(self.key[offset % 4]) - else: - result[i] ^= self.key[offset % 4] + result[i] ^= self.key[offset % 4] offset += 1 result = bytes(result) return result |