diff options
| author | Jason <jason.daurus@gmail.com> | 2016-05-28 01:11:04 +0800 |
|---|---|---|
| committer | Jason <jason.daurus@gmail.com> | 2016-05-28 01:11:04 +0800 |
| commit | 9e869f0aa17cbd202f72bab1540d866f7274a8a1 (patch) | |
| tree | 765b55027aba7685264e838d285c0587d18b9205 /test/pathod/test_utils.py | |
| parent | fb639c2e11225531172fb7b452250b58295a5a58 (diff) | |
| parent | 22ecd022a84e1c3762dd425bc9bee2230e393d8d (diff) | |
| download | mitmproxy-9e869f0aa17cbd202f72bab1540d866f7274a8a1.tar.gz mitmproxy-9e869f0aa17cbd202f72bab1540d866f7274a8a1.tar.bz2 mitmproxy-9e869f0aa17cbd202f72bab1540d866f7274a8a1.zip | |
Merge remote-tracking branch 'origin/master' into contentview
Diffstat (limited to 'test/pathod/test_utils.py')
| -rw-r--r-- | test/pathod/test_utils.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/test/pathod/test_utils.py b/test/pathod/test_utils.py index 4dcedf6e..8026a576 100644 --- a/test/pathod/test_utils.py +++ b/test/pathod/test_utils.py @@ -1,6 +1,8 @@ from pathod import utils import tutils +import six + def test_membool(): m = utils.MemBool() @@ -27,13 +29,10 @@ def test_data_path(): tutils.raises(ValueError, utils.data.path, "nonexistent") -def test_inner_repr(): - assert utils.inner_repr("\x66") == "\x66" - assert utils.inner_repr(u"foo") == "foo" - - def test_escape_unprintables(): - s = "".join([chr(i) for i in range(255)]) + s = bytes(range(256)) + if six.PY2: + s = "".join([chr(i) for i in range(255)]) e = utils.escape_unprintables(s) assert e.encode('ascii') - assert not "PATHOD_MARKER" in e + assert "PATHOD_MARKER" not in e |