From fb22f2ff4f75783ba786935c93b75f372ede21f5 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 17 Oct 2016 17:11:21 +1300 Subject: Zap object base class --- netlib/websockets/frame.py | 4 ++-- netlib/websockets/masker.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'netlib/websockets') diff --git a/netlib/websockets/frame.py b/netlib/websockets/frame.py index 2b36d461..e2ff8906 100644 --- a/netlib/websockets/frame.py +++ b/netlib/websockets/frame.py @@ -43,7 +43,7 @@ CLOSE_REASON = utils.BiDi( ) -class FrameHeader(object): +class FrameHeader(): def __init__( self, @@ -193,7 +193,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..66407df6 100644 --- a/netlib/websockets/masker.py +++ b/netlib/websockets/masker.py @@ -1,7 +1,7 @@ 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. -- cgit v1.2.3 From a647b30365593a4a3056fcf6936f5441ab9eda88 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 17 Oct 2016 17:29:45 +1300 Subject: python3: clean up class brackets --- netlib/websockets/frame.py | 4 ++-- netlib/websockets/masker.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'netlib/websockets') diff --git a/netlib/websockets/frame.py b/netlib/websockets/frame.py index e2ff8906..eb7d9ccd 100644 --- a/netlib/websockets/frame.py +++ b/netlib/websockets/frame.py @@ -43,7 +43,7 @@ CLOSE_REASON = utils.BiDi( ) -class FrameHeader(): +class FrameHeader: def __init__( self, @@ -193,7 +193,7 @@ class FrameHeader(): return False -class Frame(): +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 66407df6..f4f489a6 100644 --- a/netlib/websockets/masker.py +++ b/netlib/websockets/masker.py @@ -1,7 +1,7 @@ from __future__ import absolute_import -class Masker(): +class Masker: """ Data sent from the server must be masked to prevent malicious clients from sending data over the wire in predictable patterns. -- cgit v1.2.3 From c774a9fec93feedc37a450400a03b83f5f4cb4b9 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 17 Oct 2016 17:34:46 +1300 Subject: python3: clean up super and __future__ --- netlib/websockets/__init__.py | 1 - netlib/websockets/frame.py | 1 - netlib/websockets/masker.py | 1 - netlib/websockets/utils.py | 1 - 4 files changed, 4 deletions(-) (limited to 'netlib/websockets') 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 eb7d9ccd..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 diff --git a/netlib/websockets/masker.py b/netlib/websockets/masker.py index f4f489a6..1c8330b1 100644 --- a/netlib/websockets/masker.py +++ b/netlib/websockets/masker.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import class Masker: 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 -- cgit v1.2.3