aboutsummaryrefslogtreecommitdiffstats
path: root/test/netlib
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-10-17 17:29:45 +1300
committerAldo Cortesi <aldo@nullcube.com>2016-10-17 17:37:08 +1300
commita647b30365593a4a3056fcf6936f5441ab9eda88 (patch)
tree079b18790be5dfcc9a88f19e282b57088574d223 /test/netlib
parentfb22f2ff4f75783ba786935c93b75f372ede21f5 (diff)
downloadmitmproxy-a647b30365593a4a3056fcf6936f5441ab9eda88.tar.gz
mitmproxy-a647b30365593a4a3056fcf6936f5441ab9eda88.tar.bz2
mitmproxy-a647b30365593a4a3056fcf6936f5441ab9eda88.zip
python3: clean up class brackets
Diffstat (limited to 'test/netlib')
-rw-r--r--test/netlib/http/http1/test_read.py4
-rw-r--r--test/netlib/http/test_headers.py2
-rw-r--r--test/netlib/http/test_message.py8
-rw-r--r--test/netlib/http/test_request.py6
-rw-r--r--test/netlib/http/test_response.py6
-rw-r--r--test/netlib/test_multidict.py10
-rw-r--r--test/netlib/tservers.py2
-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
10 files changed, 23 insertions, 23 deletions
diff --git a/test/netlib/http/http1/test_read.py b/test/netlib/http/http1/test_read.py
index fb27857b..a768a722 100644
--- a/test/netlib/http/http1/test_read.py
+++ b/test/netlib/http/http1/test_read.py
@@ -104,7 +104,7 @@ def test_read_response_head():
assert rfile.read() == b"skip"
-class TestReadBody():
+class TestReadBody:
def test_chunked(self):
rfile = BytesIO(b"3\r\nfoo\r\n0\r\n\r\nbar")
body = b"".join(read_body(rfile, None))
@@ -289,7 +289,7 @@ def test_check_http_version():
_check_http_version(b"HTTP/1.b")
-class TestReadHeaders():
+class TestReadHeaders:
@staticmethod
def _read(data):
return _read_headers(BytesIO(data))
diff --git a/test/netlib/http/test_headers.py b/test/netlib/http/test_headers.py
index d214ca02..63f16897 100644
--- a/test/netlib/http/test_headers.py
+++ b/test/netlib/http/test_headers.py
@@ -4,7 +4,7 @@ from netlib.http.headers import Headers, parse_content_type, assemble_content_ty
from netlib.tutils import raises
-class TestHeaders():
+class TestHeaders:
def _2host(self):
return Headers(
(
diff --git a/test/netlib/http/test_message.py b/test/netlib/http/test_message.py
index 9a5b80ed..dd08e018 100644
--- a/test/netlib/http/test_message.py
+++ b/test/netlib/http/test_message.py
@@ -36,7 +36,7 @@ def _test_decoded_attr(message, attr):
assert getattr(message.data, attr) == b"FOO\xBF\x00BAR"
-class TestMessageData():
+class TestMessageData:
def test_eq_ne(self):
data = tresp(timestamp_start=42, timestamp_end=42).data
same = tresp(timestamp_start=42, timestamp_end=42).data
@@ -50,7 +50,7 @@ class TestMessageData():
assert data != 0
-class TestMessage():
+class TestMessage:
def test_init(self):
resp = tresp()
@@ -108,7 +108,7 @@ class TestMessage():
assert r.content == b"ggfootoo"
-class TestMessageContentEncoding():
+class TestMessageContentEncoding:
def test_simple(self):
r = tresp()
assert r.raw_content == b"message"
@@ -186,7 +186,7 @@ class TestMessageContentEncoding():
assert "content-encoding" not in r.headers
-class TestMessageText():
+class TestMessageText:
def test_simple(self):
r = tresp(content=b'\xfc')
assert r.raw_content == b"\xfc"
diff --git a/test/netlib/http/test_request.py b/test/netlib/http/test_request.py
index bcb1cc43..e091f280 100644
--- a/test/netlib/http/test_request.py
+++ b/test/netlib/http/test_request.py
@@ -6,7 +6,7 @@ from netlib.tutils import treq, raises
from .test_message import _test_decoded_attr, _test_passthrough_attr
-class TestRequestData():
+class TestRequestData:
def test_init(self):
with raises(ValueError):
treq(headers="foobar")
@@ -14,7 +14,7 @@ class TestRequestData():
assert isinstance(treq(headers=()).headers, Headers)
-class TestRequestCore():
+class TestRequestCore:
"""
Tests for builtins and the attributes that are directly proxied from the data structure
"""
@@ -92,7 +92,7 @@ class TestRequestCore():
assert request.headers["Host"] == "example.org"
-class TestRequestUtils():
+class TestRequestUtils:
"""
Tests for additional convenience methods.
"""
diff --git a/test/netlib/http/test_response.py b/test/netlib/http/test_response.py
index 6ab043c1..66d6e307 100644
--- a/test/netlib/http/test_response.py
+++ b/test/netlib/http/test_response.py
@@ -11,7 +11,7 @@ from netlib.tutils import raises, tresp
from .test_message import _test_passthrough_attr, _test_decoded_attr
-class TestResponseData():
+class TestResponseData:
def test_init(self):
with raises(ValueError):
tresp(headers="foobar")
@@ -19,7 +19,7 @@ class TestResponseData():
assert isinstance(tresp(headers=()).headers, Headers)
-class TestResponseCore():
+class TestResponseCore:
"""
Tests for builtins and the attributes that are directly proxied from the data structure
"""
@@ -60,7 +60,7 @@ class TestResponseCore():
_test_decoded_attr(tresp(), "reason")
-class TestResponseUtils():
+class TestResponseUtils:
"""
Tests for additional convenience methods.
"""
diff --git a/test/netlib/test_multidict.py b/test/netlib/test_multidict.py
index bad5e2b4..a9523fd9 100644
--- a/test/netlib/test_multidict.py
+++ b/test/netlib/test_multidict.py
@@ -2,7 +2,7 @@ from netlib import tutils
from netlib.multidict import MultiDict, ImmutableMultiDict, MultiDictView
-class _TMulti():
+class _TMulti:
@staticmethod
def _kconv(key):
return key.lower()
@@ -16,7 +16,7 @@ class TImmutableMultiDict(_TMulti, ImmutableMultiDict):
pass
-class TestMultiDict():
+class TestMultiDict:
@staticmethod
def _multi():
return TMultiDict((
@@ -194,7 +194,7 @@ class TestMultiDict():
assert md == md2
-class TestImmutableMultiDict():
+class TestImmutableMultiDict:
def test_modify(self):
md = TImmutableMultiDict()
with tutils.raises(TypeError):
@@ -224,7 +224,7 @@ class TestImmutableMultiDict():
assert md.with_insert(0, "foo", "bar").fields == (("foo", "bar"),)
-class TParent():
+class TParent:
def __init__(self):
self.vals = tuple()
@@ -235,7 +235,7 @@ class TParent():
return self.vals
-class TestMultiDictView():
+class TestMultiDictView:
def test_modify(self):
p = TParent()
tv = MultiDictView(p.getter, p.setter)
diff --git a/test/netlib/tservers.py b/test/netlib/tservers.py
index d22be413..fdf40ff3 100644
--- a/test/netlib/tservers.py
+++ b/test/netlib/tservers.py
@@ -85,7 +85,7 @@ class _TServer(tcp.TCPServer):
self.q.put(s.getvalue())
-class ServerTestBase():
+class ServerTestBase:
ssl = None
handler = None
addr = ("localhost", 0)
diff --git a/test/netlib/websockets/test_frame.py b/test/netlib/websockets/test_frame.py
index 265d2513..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():
+class TestFrameHeader:
@pytest.mark.parametrize("input,expected", [
(0, '0100'),
@@ -123,7 +123,7 @@ class TestFrameHeader():
assert f.masking_key
-class TestFrame():
+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 a06fd079..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():
+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 7e3f02f9..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():
+class TestUtils:
def test_client_handshake_headers(self):
h = websockets.client_handshake_headers(version='42')