test & examples: zap six

8 files changed, 19 insertions, 42 deletions

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'
diff --git a/test/netlib/test_debug.py b/test/netlib/test_debug.py
index 9ceaace9..4732125b 100644
--- a/test/netlib/test_debug.py
+++ b/test/netlib/test_debug.py
@@ -1,17 +1,17 @@
 from __future__ import (absolute_import, print_function, division)
-from six.moves import cStringIO as StringIO
+import io
 
 from netlib import debug
 
 
 def test_dump_info():
-    cs = StringIO()
+    cs = io.StringIO()
     debug.dump_info(None, None, file=cs, testing=True)
     assert cs.getvalue()
 
 
 def test_dump_stacks():
-    cs = StringIO()
+    cs = io.StringIO()
     debug.dump_stacks(None, None, file=cs, testing=True)
     assert cs.getvalue()
 
diff --git a/test/netlib/test_strutils.py b/test/netlib/test_strutils.py
index 0f58cac5..36f709da 100644
--- a/test/netlib/test_strutils.py
+++ b/test/netlib/test_strutils.py
@@ -1,5 +1,3 @@
-import six
-
 from netlib import strutils, tutils
 
 
@@ -15,12 +13,8 @@ def test_always_bytes():
 def test_native():
     with tutils.raises(TypeError):
         strutils.native(42)
-    if six.PY2:
-        assert strutils.native(u"foo") == b"foo"
-        assert strutils.native(b"foo") == b"foo"
-    else:
-        assert strutils.native(u"foo") == u"foo"
-        assert strutils.native(b"foo") == u"foo"
+    assert strutils.native(u"foo") == u"foo"
+    assert strutils.native(b"foo") == u"foo"
 
 
 def test_escape_control_characters():
@@ -40,9 +34,8 @@ def test_escape_control_characters():
         u'=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~.'
     )
 
-    if not six.PY2:
-        with tutils.raises(ValueError):
-            strutils.escape_control_characters(b"foo")
+    with tutils.raises(ValueError):
+        strutils.escape_control_characters(b"foo")
 
 
 def test_bytes_to_escaped_str():
@@ -76,12 +69,8 @@ def test_escaped_str_to_bytes():
     assert strutils.escaped_str_to_bytes(u"&!?=\\\\)") == br"&!?=\)"
     assert strutils.escaped_str_to_bytes(u"\u00fc") == b'\xc3\xbc'
 
-    if six.PY2:
-        with tutils.raises(ValueError):
-            strutils.escaped_str_to_bytes(42)
-    else:
-        with tutils.raises(ValueError):
-            strutils.escaped_str_to_bytes(b"very byte")
+    with tutils.raises(ValueError):
+        strutils.escaped_str_to_bytes(b"very byte")
 
 
 def test_is_mostly_bin():
diff --git a/test/netlib/test_tcp.py b/test/netlib/test_tcp.py
index dc2f4e7e..797a5a04 100644
--- a/test/netlib/test_tcp.py
+++ b/test/netlib/test_tcp.py
@@ -1,5 +1,5 @@
 from io import BytesIO
-from six.moves import queue
+import queue
 import time
 import socket
 import random
diff --git a/test/netlib/test_version_check.py b/test/netlib/test_version_check.py
index fa6b19e5..01820dad 100644
--- a/test/netlib/test_version_check.py
+++ b/test/netlib/test_version_check.py
@@ -1,11 +1,11 @@
-from io import StringIO
+import io
 import mock
 from netlib import version_check
 
 
 @mock.patch("sys.exit")
 def test_check_pyopenssl_version(sexit):
-    fp = StringIO()
+    fp = io.StringIO()
     version_check.check_pyopenssl_version(fp=fp)
     assert not fp.getvalue()
     assert not sexit.called
@@ -19,7 +19,7 @@ def test_check_pyopenssl_version(sexit):
 @mock.patch("OpenSSL.__version__")
 def test_unparseable_pyopenssl_version(version, sexit):
     version.split.return_value = ["foo", "bar"]
-    fp = StringIO()
+    fp = io.StringIO()
     version_check.check_pyopenssl_version(fp=fp)
     assert "Cannot parse" in fp.getvalue()
     assert not sexit.called
diff --git a/test/netlib/tservers.py b/test/netlib/tservers.py
index a80dcb28..10a6f70a 100644
--- a/test/netlib/tservers.py
+++ b/test/netlib/tservers.py
@@ -1,8 +1,8 @@
 from __future__ import (absolute_import, print_function, division)
 
 import threading
-from six.moves import queue
-from io import StringIO
+import queue
+import io
 import OpenSSL
 
 from netlib import tcp
@@ -80,7 +80,7 @@ class _TServer(tcp.TCPServer):
         h.finish()
 
     def handle_error(self, connection, client_address, fp=None):
-        s = StringIO()
+        s = io.StringIO()
         tcp.TCPServer.handle_error(self, connection, client_address, s)
         self.q.put(s.getvalue())