From ce98a9219e060b729d4b0d2dc28bf4510649f0fd Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 17 Oct 2016 16:38:31 +1300 Subject: test & examples: zap six --- test/netlib/http/test_message.py | 6 ++---- test/netlib/http/test_request.py | 6 ------ test/netlib/http/test_url.py | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) (limited to 'test/netlib/http') diff --git a/test/netlib/http/test_message.py b/test/netlib/http/test_message.py index 74272309..5d533ad7 100644 --- a/test/netlib/http/test_message.py +++ b/test/netlib/http/test_message.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import, print_function, division -import six - from netlib.tutils import tresp from netlib import http, tutils @@ -245,7 +243,7 @@ class TestMessageText(object): with tutils.raises(ValueError): assert r.text - assert r.get_text(strict=False) == u'\ufffd' if six.PY2 else '\udcff' + assert r.get_text(strict=False) == '\udcff' def test_cannot_encode(self): r = tresp() @@ -271,4 +269,4 @@ class TestMessageText(object): r.headers["content-type"] = "text/html; charset=latin1" r.text = u'\udcff' assert r.headers["content-type"] == "text/html; charset=utf-8" - assert r.raw_content == b'\xed\xb3\xbf' if six.PY2 else b"\xFF" + assert r.raw_content == b"\xFF" diff --git a/test/netlib/http/test_request.py b/test/netlib/http/test_request.py index 9baabaa6..1f01d29d 100644 --- a/test/netlib/http/test_request.py +++ b/test/netlib/http/test_request.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import, print_function, division -import six - from netlib.http import Headers from netlib.tutils import treq, raises from .test_message import _test_decoded_attr, _test_passthrough_attr @@ -57,10 +55,6 @@ class TestRequestCore(object): assert req.data.path is None def test_host(self): - if six.PY2: - from unittest import SkipTest - raise SkipTest() - request = treq() assert request.host == request.data.host.decode("idna") diff --git a/test/netlib/http/test_url.py b/test/netlib/http/test_url.py index 768e5130..631ed8a9 100644 --- a/test/netlib/http/test_url.py +++ b/test/netlib/http/test_url.py @@ -1,4 +1,3 @@ -import six from netlib import tutils from netlib.http import url @@ -58,10 +57,7 @@ def test_unparse(): assert url.unparse("https", "foo.com", 443, "") == "https://foo.com" -if six.PY2: - surrogates = bytes(bytearray(range(256))) -else: - surrogates = bytes(range(256)).decode("utf8", "surrogateescape") +surrogates = bytes(range(256)).decode("utf8", "surrogateescape") surrogates_quoted = ( '%00%01%02%03%04%05%06%07%08%09%0A%0B%0C%0D%0E%0F' -- cgit v1.2.3