From 18ee6255c03dafff715650b15ae3cd6ff6152bac Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Fri, 21 Oct 2016 11:40:05 +1300
Subject: multidict: ditch ImmutableMultiDict

A contorted class we only use for cookie attributes. We don't need it.
---
 test/mitmproxy/test_types_multidict.py | 34 ----------------------------------
 1 file changed, 34 deletions(-)

(limited to 'test')

diff --git a/test/mitmproxy/test_types_multidict.py b/test/mitmproxy/test_types_multidict.py
index d566905c..cf80c05e 100644
--- a/test/mitmproxy/test_types_multidict.py
+++ b/test/mitmproxy/test_types_multidict.py
@@ -12,10 +12,6 @@ class TMultiDict(_TMulti, multidict.MultiDict):
     pass
 
 
-class TImmutableMultiDict(_TMulti, multidict.ImmutableMultiDict):
-    pass
-
-
 class TestMultiDict:
     @staticmethod
     def _multi():
@@ -194,36 +190,6 @@ class TestMultiDict:
         assert md == md2
 
 
-class TestImmutableMultiDict:
-    def test_modify(self):
-        md = TImmutableMultiDict()
-        with tutils.raises(TypeError):
-            md["foo"] = "bar"
-
-        with tutils.raises(TypeError):
-            del md["foo"]
-
-        with tutils.raises(TypeError):
-            md.add("foo", "bar")
-
-    def test_hash(self):
-        assert hash(TImmutableMultiDict())
-
-    def test_with_delitem(self):
-        md = TImmutableMultiDict([("foo", "bar")])
-        assert md.with_delitem("foo").fields == ()
-        assert md.fields == (("foo", "bar"),)
-
-    def test_with_set_all(self):
-        md = TImmutableMultiDict()
-        assert md.with_set_all("foo", ["bar"]).fields == (("foo", "bar"),)
-        assert md.fields == ()
-
-    def test_with_insert(self):
-        md = TImmutableMultiDict()
-        assert md.with_insert(0, "foo", "bar").fields == (("foo", "bar"),)
-
-
 class TParent:
     def __init__(self):
         self.vals = tuple()
-- 
cgit v1.2.3


From cc8b422d9d4cdf5e6933567ec7be45f59ca95f3a Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Fri, 21 Oct 2016 11:41:54 +1300
Subject: multidict: remove to_dict

We never use it, and it is dangerously ambiguous when a key is associated with
a list.
---
 test/mitmproxy/test_types_multidict.py | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'test')

diff --git a/test/mitmproxy/test_types_multidict.py b/test/mitmproxy/test_types_multidict.py
index cf80c05e..e0bbc9b1 100644
--- a/test/mitmproxy/test_types_multidict.py
+++ b/test/mitmproxy/test_types_multidict.py
@@ -172,13 +172,6 @@ class TestMultiDict:
         assert list(md.items()) == [("foo", "bar"), ("bar", "baz")]
         assert list(md.items(multi=True)) == [("foo", "bar"), ("bar", "baz"), ("Bar", "bam")]
 
-    def test_to_dict(self):
-        md = self._multi()
-        assert md.to_dict() == {
-            "foo": "bar",
-            "bar": ["baz", "bam"]
-        }
-
     def test_state(self):
         md = self._multi()
         assert len(md.get_state()) == 3
-- 
cgit v1.2.3