diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-10-17 15:35:09 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-17 15:35:09 +1300 |
| commit | 421679a770c811ceeeccace6310dffcbbe6362dd (patch) | |
| tree | 6bbdcfe54fcce1e41660ca07c9470f42debdec5b /netlib/websockets/masker.py | |
| parent | 4918feb7252c76c95d85cd8b2b0334a22aaae274 (diff) | |
| parent | 8360f70024330eeeb5c53d29e4a05194f872b511 (diff) | |
| download | mitmproxy-421679a770c811ceeeccace6310dffcbbe6362dd.tar.gz mitmproxy-421679a770c811ceeeccace6310dffcbbe6362dd.tar.bz2 mitmproxy-421679a770c811ceeeccace6310dffcbbe6362dd.zip | |
Merge pull request #1613 from cortesi/python3
First-order conversion to Python3-only
Diffstat (limited to 'netlib/websockets/masker.py')
| -rw-r--r-- | netlib/websockets/masker.py | 7 |
1 files changed, 1 insertions, 6 deletions
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 |