diff options
Diffstat (limited to 'test/netlib/http')
-rw-r--r-- | test/netlib/http/http1/test_assemble.py | 1 | ||||
-rw-r--r-- | test/netlib/http/http1/test_read.py | 5 | ||||
-rw-r--r-- | test/netlib/http/test_headers.py | 2 | ||||
-rw-r--r-- | test/netlib/http/test_message.py | 9 | ||||
-rw-r--r-- | test/netlib/http/test_request.py | 7 | ||||
-rw-r--r-- | test/netlib/http/test_response.py | 7 |
6 files changed, 13 insertions, 18 deletions
diff --git a/test/netlib/http/http1/test_assemble.py b/test/netlib/http/http1/test_assemble.py index 841ea58a..5d7e007e 100644 --- a/test/netlib/http/http1/test_assemble.py +++ b/test/netlib/http/http1/test_assemble.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, division from netlib.exceptions import HttpException from netlib.http import Headers from netlib.http.http1.assemble import ( diff --git a/test/netlib/http/http1/test_read.py b/test/netlib/http/http1/test_read.py index 44eff2ee..86480e2b 100644 --- a/test/netlib/http/http1/test_read.py +++ b/test/netlib/http/http1/test_read.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, division from io import BytesIO from mock import Mock @@ -104,7 +103,7 @@ def test_read_response_head(): assert rfile.read() == b"skip" -class TestReadBody(object): +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 +288,7 @@ def test_check_http_version(): _check_http_version(b"HTTP/1.b") -class TestReadHeaders(object): +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 e8752c52..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(object): +class TestHeaders: def _2host(self): return Headers( ( diff --git a/test/netlib/http/test_message.py b/test/netlib/http/test_message.py index 5d533ad7..8374f8f6 100644 --- a/test/netlib/http/test_message.py +++ b/test/netlib/http/test_message.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, print_function, division from netlib.tutils import tresp from netlib import http, tutils @@ -36,7 +35,7 @@ def _test_decoded_attr(message, attr): assert getattr(message.data, attr) == b"FOO\xBF\x00BAR" -class TestMessageData(object): +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 +49,7 @@ class TestMessageData(object): assert data != 0 -class TestMessage(object): +class TestMessage: def test_init(self): resp = tresp() @@ -108,7 +107,7 @@ class TestMessage(object): assert r.content == b"ggfootoo" -class TestMessageContentEncoding(object): +class TestMessageContentEncoding: def test_simple(self): r = tresp() assert r.raw_content == b"message" @@ -186,7 +185,7 @@ class TestMessageContentEncoding(object): assert "content-encoding" not in r.headers -class TestMessageText(object): +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 1f01d29d..87eb9c35 100644 --- a/test/netlib/http/test_request.py +++ b/test/netlib/http/test_request.py @@ -1,12 +1,11 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, print_function, division from netlib.http import Headers from netlib.tutils import treq, raises from .test_message import _test_decoded_attr, _test_passthrough_attr -class TestRequestData(object): +class TestRequestData: def test_init(self): with raises(ValueError): treq(headers="foobar") @@ -14,7 +13,7 @@ class TestRequestData(object): assert isinstance(treq(headers=()).headers, Headers) -class TestRequestCore(object): +class TestRequestCore: """ Tests for builtins and the attributes that are directly proxied from the data structure """ @@ -92,7 +91,7 @@ class TestRequestCore(object): assert request.headers["Host"] == "example.org" -class TestRequestUtils(object): +class TestRequestUtils: """ Tests for additional convenience methods. """ diff --git a/test/netlib/http/test_response.py b/test/netlib/http/test_response.py index e97cc419..bf08e6f2 100644 --- a/test/netlib/http/test_response.py +++ b/test/netlib/http/test_response.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function, division import email @@ -11,7 +10,7 @@ from netlib.tutils import raises, tresp from .test_message import _test_passthrough_attr, _test_decoded_attr -class TestResponseData(object): +class TestResponseData: def test_init(self): with raises(ValueError): tresp(headers="foobar") @@ -19,7 +18,7 @@ class TestResponseData(object): assert isinstance(tresp(headers=()).headers, Headers) -class TestResponseCore(object): +class TestResponseCore: """ Tests for builtins and the attributes that are directly proxied from the data structure """ @@ -60,7 +59,7 @@ class TestResponseCore(object): _test_decoded_attr(tresp(), "reason") -class TestResponseUtils(object): +class TestResponseUtils: """ Tests for additional convenience methods. """ |