diff options
author | Aldo Cortesi <aldo@corte.si> | 2016-10-17 17:03:02 +1300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-17 17:03:02 +1300 |
commit | ae3ff8ee1edc646e7a640219df1a312c27f7c339 (patch) | |
tree | 490697113ceaf12cc704c418357139e60a0190f3 /test/netlib/http/test_url.py | |
parent | 3fbce7e981cab5d20b3ef17a50f14b34e8c60fa3 (diff) | |
parent | ce98a9219e060b729d4b0d2dc28bf4510649f0fd (diff) | |
download | mitmproxy-ae3ff8ee1edc646e7a640219df1a312c27f7c339.tar.gz mitmproxy-ae3ff8ee1edc646e7a640219df1a312c27f7c339.tar.bz2 mitmproxy-ae3ff8ee1edc646e7a640219df1a312c27f7c339.zip |
Merge pull request #1615 from cortesi/python3a
exterminate six
Diffstat (limited to 'test/netlib/http/test_url.py')
-rw-r--r-- | test/netlib/http/test_url.py | 6 |
1 files changed, 1 insertions, 5 deletions
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' |