diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-05-31 17:33:57 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-05-31 17:33:57 -0700 |
| commit | 1dd078beb23aa0b483f945eed39c0136984f81a6 (patch) | |
| tree | c21863e80e79f934c1744ad1e5851d2ef95c9087 /netlib/websockets/frame.py | |
| parent | ebeda5e8d261bcdd8763ce4e634d534b0285527c (diff) | |
| parent | 44fdcb4b8291a5be6738f32d6fde307af3f2034e (diff) | |
| download | mitmproxy-1dd078beb23aa0b483f945eed39c0136984f81a6.tar.gz mitmproxy-1dd078beb23aa0b483f945eed39c0136984f81a6.tar.bz2 mitmproxy-1dd078beb23aa0b483f945eed39c0136984f81a6.zip | |
Merge pull request #1182 from cortesi/netlibimports
Reorganise netlib imports according to Google Style Guide
Diffstat (limited to 'netlib/websockets/frame.py')
| -rw-r--r-- | netlib/websockets/frame.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/netlib/websockets/frame.py b/netlib/websockets/frame.py index cf8917c1..deb0ce33 100644 --- a/netlib/websockets/frame.py +++ b/netlib/websockets/frame.py @@ -6,10 +6,10 @@ import warnings import six -from .protocol import Masker from netlib import tcp from netlib import utils from netlib import human +from netlib.websockets import protocol MAX_16_BIT_INT = (1 << 16) @@ -267,7 +267,7 @@ class Frame(object): """ b = bytes(self.header) if self.header.masking_key: - b += Masker(self.header.masking_key)(self.payload) + b += protocol.Masker(self.header.masking_key)(self.payload) else: b += self.payload return b @@ -296,7 +296,7 @@ class Frame(object): payload = fp.safe_read(header.payload_length) if header.mask == 1 and header.masking_key: - payload = Masker(header.masking_key)(payload) + payload = protocol.Masker(header.masking_key)(payload) return cls( payload, |