aboutsummaryrefslogtreecommitdiffstats
path: root/test/netlib/websockets
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2016-10-17 18:21:23 +1300
committerGitHub <noreply@github.com>2016-10-17 18:21:23 +1300
commit00071238d2e79ff91132b7e5a3bcc8019d9191ec (patch)
tree507c346e8f8c605d428140274678fced2e6bbc16 /test/netlib/websockets
parent666c59cbfbcbd28062c201c3cb5d6cb928e90aee (diff)
parentc774a9fec93feedc37a450400a03b83f5f4cb4b9 (diff)
downloadmitmproxy-00071238d2e79ff91132b7e5a3bcc8019d9191ec.tar.gz
mitmproxy-00071238d2e79ff91132b7e5a3bcc8019d9191ec.tar.bz2
mitmproxy-00071238d2e79ff91132b7e5a3bcc8019d9191ec.zip
Merge pull request #1617 from cortesi/object
python3
Diffstat (limited to 'test/netlib/websockets')
-rw-r--r--test/netlib/websockets/test_frame.py4
-rw-r--r--test/netlib/websockets/test_masker.py2
-rw-r--r--test/netlib/websockets/test_utils.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/test/netlib/websockets/test_frame.py b/test/netlib/websockets/test_frame.py
index cce39454..a039dcb1 100644
--- a/test/netlib/websockets/test_frame.py
+++ b/test/netlib/websockets/test_frame.py
@@ -6,7 +6,7 @@ from netlib import websockets
from netlib import tutils
-class TestFrameHeader(object):
+class TestFrameHeader:
@pytest.mark.parametrize("input,expected", [
(0, '0100'),
@@ -123,7 +123,7 @@ class TestFrameHeader(object):
assert f.masking_key
-class TestFrame(object):
+class TestFrame:
def test_equality(self):
f = websockets.Frame(payload=b'1234')
f2 = websockets.Frame(payload=b'1234')
diff --git a/test/netlib/websockets/test_masker.py b/test/netlib/websockets/test_masker.py
index 528fce71..23a9b876 100644
--- a/test/netlib/websockets/test_masker.py
+++ b/test/netlib/websockets/test_masker.py
@@ -4,7 +4,7 @@ import pytest
from netlib import websockets
-class TestMasker(object):
+class TestMasker:
@pytest.mark.parametrize("input,expected", [
([b"a"], '00'),
diff --git a/test/netlib/websockets/test_utils.py b/test/netlib/websockets/test_utils.py
index 34765e04..f6f1e40a 100644
--- a/test/netlib/websockets/test_utils.py
+++ b/test/netlib/websockets/test_utils.py
@@ -4,7 +4,7 @@ from netlib import http
from netlib import websockets
-class TestUtils(object):
+class TestUtils:
def test_client_handshake_headers(self):
h = websockets.client_handshake_headers(version='42')