aboutsummaryrefslogtreecommitdiffstats
path: root/test/netlib/http/test_message.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2016-10-17 17:03:02 +1300
committerGitHub <noreply@github.com>2016-10-17 17:03:02 +1300
commitae3ff8ee1edc646e7a640219df1a312c27f7c339 (patch)
tree490697113ceaf12cc704c418357139e60a0190f3 /test/netlib/http/test_message.py
parent3fbce7e981cab5d20b3ef17a50f14b34e8c60fa3 (diff)
parentce98a9219e060b729d4b0d2dc28bf4510649f0fd (diff)
downloadmitmproxy-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_message.py')
-rw-r--r--test/netlib/http/test_message.py6
1 files changed, 2 insertions, 4 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"