aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-07-06 19:50:06 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-07-06 19:53:29 -0700
commit9c873d63f4ede1b2470f8e7ea838909e60efe998 (patch)
tree0f37b0c6a5a792438dff3225c2045c0aa923e187 /test
parent55fae7cea90ee69338ef410e1db4a48b8b604619 (diff)
downloadmitmproxy-9c873d63f4ede1b2470f8e7ea838909e60efe998.tar.gz
mitmproxy-9c873d63f4ede1b2470f8e7ea838909e60efe998.tar.bz2
mitmproxy-9c873d63f4ede1b2470f8e7ea838909e60efe998.zip
py3++, multidict fixes
This commit improves Python 3 compatibility and fixes two multidict issues: 1. Headers.items(multi=True) now decodes fields 2. MultiDict.clear(item) has been removed, as Python's MutableMapping already defines .clear() with different semantics. This is confusing for everyone who expects a dict-like object. `.pop("attr", None)` is not fantastic, but it's the Python way to do it.
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/test_web_master.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/mitmproxy/test_web_master.py b/test/mitmproxy/test_web_master.py
index 98f53c93..f0fafe24 100644
--- a/test/mitmproxy/test_web_master.py
+++ b/test/mitmproxy/test_web_master.py
@@ -13,5 +13,5 @@ class TestWebMaster(mastertest.MasterTest):
def test_basic(self):
m = self.mkmaster(None)
for i in (1, 2, 3):
- self.dummy_cycle(m, 1, "")
+ self.dummy_cycle(m, 1, b"")
assert len(m.state.flows) == i