From 44fdcb4b8291a5be6738f32d6fde307af3f2034e Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Wed, 1 Jun 2016 11:12:10 +1200 Subject: Reorganise netlib imports according to Google Style Guide --- netlib/websockets/frame.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'netlib/websockets/frame.py') 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, -- cgit v1.2.3