diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2015-06-18 12:07:20 +1200 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2015-06-18 12:07:20 +1200 |
commit | 4152b14387e1fd59f388f695ac468be2a888caa2 (patch) | |
tree | 833fe7698ac291c892ee06cdf621035c17447764 /netlib/websockets.py | |
parent | 5bb7159edd7bf1d54b75969a2d3859e9570e8361 (diff) | |
parent | a652e050b759ca27aa3b794b8e11009853edef34 (diff) | |
download | mitmproxy-4152b14387e1fd59f388f695ac468be2a888caa2.tar.gz mitmproxy-4152b14387e1fd59f388f695ac468be2a888caa2.tar.bz2 mitmproxy-4152b14387e1fd59f388f695ac468be2a888caa2.zip |
Merge pull request #71 from Kriechi/landscape
fix warnings and code smells
Diffstat (limited to 'netlib/websockets.py')
-rw-r--r-- | netlib/websockets.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/netlib/websockets.py b/netlib/websockets.py index 346adf1b..c45db4df 100644 --- a/netlib/websockets.py +++ b/netlib/websockets.py @@ -35,7 +35,7 @@ OPCODE = utils.BiDi( ) -class Masker: +class Masker(object): """ Data sent from the server must be masked to prevent malicious clients @@ -94,15 +94,15 @@ def server_handshake_headers(key): ) -def make_length_code(len): +def make_length_code(length): """ A websockets frame contains an initial length_code, and an optional extended length code to represent the actual length if length code is larger than 125 """ - if len <= 125: - return len - elif len >= 126 and len <= 65535: + if length <= 125: + return length + elif length >= 126 and length <= 65535: return 126 else: return 127 @@ -129,7 +129,7 @@ def create_server_nonce(client_nonce): DEFAULT = object() -class FrameHeader: +class FrameHeader(object): def __init__( self, @@ -216,7 +216,7 @@ class FrameHeader: return b @classmethod - def from_file(klass, fp): + def from_file(cls, fp): """ read a websockets frame header """ @@ -248,7 +248,7 @@ class FrameHeader: else: masking_key = None - return klass( + return cls( fin=fin, rsv1=rsv1, rsv2=rsv2, |