diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-10-17 18:21:23 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-17 18:21:23 +1300 |
| commit | 00071238d2e79ff91132b7e5a3bcc8019d9191ec (patch) | |
| tree | 507c346e8f8c605d428140274678fced2e6bbc16 /netlib/websockets | |
| parent | 666c59cbfbcbd28062c201c3cb5d6cb928e90aee (diff) | |
| parent | c774a9fec93feedc37a450400a03b83f5f4cb4b9 (diff) | |
| download | mitmproxy-00071238d2e79ff91132b7e5a3bcc8019d9191ec.tar.gz mitmproxy-00071238d2e79ff91132b7e5a3bcc8019d9191ec.tar.bz2 mitmproxy-00071238d2e79ff91132b7e5a3bcc8019d9191ec.zip | |
Merge pull request #1617 from cortesi/object
python3
Diffstat (limited to 'netlib/websockets')
| -rw-r--r-- | netlib/websockets/__init__.py | 1 | ||||
| -rw-r--r-- | netlib/websockets/frame.py | 5 | ||||
| -rw-r--r-- | netlib/websockets/masker.py | 3 | ||||
| -rw-r--r-- | netlib/websockets/utils.py | 1 |
4 files changed, 3 insertions, 7 deletions
diff --git a/netlib/websockets/__init__.py b/netlib/websockets/__init__.py index e14e8a7d..06c8f9bc 100644 --- a/netlib/websockets/__init__.py +++ b/netlib/websockets/__init__.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, division from .frame import FrameHeader from .frame import Frame diff --git a/netlib/websockets/frame.py b/netlib/websockets/frame.py index 2b36d461..b58fa289 100644 --- a/netlib/websockets/frame.py +++ b/netlib/websockets/frame.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import os import struct import io @@ -43,7 +42,7 @@ CLOSE_REASON = utils.BiDi( ) -class FrameHeader(object): +class FrameHeader: def __init__( self, @@ -193,7 +192,7 @@ class FrameHeader(object): return False -class Frame(object): +class Frame: """ Represents a single WebSockets frame. Constructor takes human readable forms of the frame components. diff --git a/netlib/websockets/masker.py b/netlib/websockets/masker.py index 03b8f435..1c8330b1 100644 --- a/netlib/websockets/masker.py +++ b/netlib/websockets/masker.py @@ -1,7 +1,6 @@ -from __future__ import absolute_import -class Masker(object): +class Masker: """ Data sent from the server must be masked to prevent malicious clients from sending data over the wire in predictable patterns. diff --git a/netlib/websockets/utils.py b/netlib/websockets/utils.py index aa0d39a1..fdec074e 100644 --- a/netlib/websockets/utils.py +++ b/netlib/websockets/utils.py @@ -3,7 +3,6 @@ Collection of WebSockets Protocol utility functions (RFC6455) Spec: https://tools.ietf.org/html/rfc6455 """ -from __future__ import absolute_import import base64 import hashlib |