Fix CIMultiDict output casing in Python implementations (to match Cython) (#203)

* Fix: setitem & setdefault lost original casing from caller

* Fix: pytest.raises() used incorrect kwarg "matches" (has no effect)

* Fix: KeyError messages should preserve passed casing

* Fix: missing call to self._key()

Author: mikenerone

multidict/_multidict_py.py

@@ -243,7 +243,7 @@ def _extend(self, args, kwargs, name, method):
 
             method(items)
 
-        method([(self._title(key), key, value)
+        method([(self._title(key), self._key(key), value)
                for key, value in kwargs.items()])
 
     def _extend_items(self, items):
@@ -258,15 +258,14 @@ def clear(self):
     # Mapping interface #
 
     def __setitem__(self, key, value):
-        key = self._title(key)
         self._replace(key, value)
 
     def __delitem__(self, key):
-        key = self._title(key)
+        identity = self._title(key)
         items = self._impl._items
         found = False
         for i in range(len(items) - 1, -1, -1):
-            if items[i][0] == key:
+            if items[i][0] == identity:
                 del items[i]
                 found = True
         if not found:
@@ -276,9 +275,9 @@ def __delitem__(self, key):
 
     def setdefault(self, key, default=None):
         """Return value for key, set value to default if key is not present."""
-        key = self._title(key)
+        identity = self._title(key)
         for i, k, v in self._impl._items:
-            if i == key:
+            if i == identity:
                 return v
         self.add(key, default)
         return default
@@ -290,9 +289,9 @@ def popone(self, key, default=_marker):
         KeyError is raised.
 
         """
-        key = self._title(key)
+        identity = self._title(key)
         for i in range(len(self._impl._items)):
-            if self._impl._items[i][0] == key:
+            if self._impl._items[i][0] == identity:
                 value = self._impl._items[i][2]
                 del self._impl._items[i]
                 self._impl.incr_version()

tests/test_multidict.py

@@ -118,9 +118,9 @@ def test_getone(self, cls):
         assert d.get('key') == 'value1'
         assert d['key'] == 'value1'
 
-        with pytest.raises(KeyError, matches='key2'):
+        with pytest.raises(KeyError, match='key2'):
             d['key2']
-        with pytest.raises(KeyError, matches='key2'):
+        with pytest.raises(KeyError, match='key2'):
             d.getone('key2')
 
         assert d.getone('key2', 'default') == 'default'
@@ -326,7 +326,7 @@ def test_getall(self, cls):
 
         assert d.getall('key') == ['value1', 'value2']
 
-        with pytest.raises(KeyError, matches='some_key'):
+        with pytest.raises(KeyError, match='some_key'):
             d.getall('some_key')
 
         default = object()
@@ -374,9 +374,9 @@ def test_basics(self, cls):
         assert d['key'] == 'value1'
         assert 'key' in d
 
-        with pytest.raises(KeyError):
+        with pytest.raises(KeyError, match='key2'):
             d['key2']
-        with pytest.raises(KeyError):
+        with pytest.raises(KeyError, match='key2'):
             d.getone('key2')
 
     def test_getall(self, cls):
@@ -387,9 +387,8 @@ def test_getall(self, cls):
 
         assert d.getall('key') == ['value1', 'value2']
 
-        with pytest.raises(KeyError) as excinfo:
+        with pytest.raises(KeyError, match='some_key'):
             d.getall('some_key')
-        assert "some_key" in str(excinfo.value)
 
     def test_get(self, cls):
         d = cls([('A', 1), ('a', 2)])

tests/test_mutable_multidict.py

@@ -37,9 +37,8 @@ def test_getall(self, cls):
 
         assert d.getall('key') == ['value1', 'value2']
 
-        with pytest.raises(KeyError) as excinfo:
+        with pytest.raises(KeyError, match='some_key'):
             d.getall('some_key')
-        assert 'some_key' in str(excinfo.value)
 
         default = object()
         assert d.getall('some_key', default) is default
@@ -116,7 +115,7 @@ def test_del(self, cls):
         assert d == {'foo': 'bar'}
         assert list(d.items()) == [('foo', 'bar')]
 
-        with pytest.raises(KeyError):
+        with pytest.raises(KeyError, match='key'):
             del d['key']
 
     def test_set_default(self, cls):
@@ -166,7 +165,7 @@ def test_pop_default(self, cls):
     def test_pop_raises(self, cls):
         d = cls(other='val')
 
-        with pytest.raises(KeyError):
+        with pytest.raises(KeyError, match='key'):
             d.pop('key')
 
         assert 'other' in d
@@ -218,7 +217,7 @@ def test_popall_default(self, cls):
 
     def test_popall_key_error(self, cls):
         d = cls()
-        with pytest.raises(KeyError):
+        with pytest.raises(KeyError, match='key'):
             d.popall('key')
 
 
@@ -244,18 +243,19 @@ def test_getall(self, cls):
 
         assert d.getall('key') == ['value1', 'value2']
 
-        with pytest.raises(KeyError) as excinfo:
+        with pytest.raises(KeyError, match='some_key'):
             d.getall('some_key')
-        assert 'some_key' in str(excinfo.value)
 
     def test_ctor(self, cls):
         d = cls(k1='v1')
         assert 'v1' == d['K1']
+        assert ('k1', 'v1') in d.items()
 
     def test_setitem(self, cls):
         d = cls()
         d['k1'] = 'v1'
         assert 'v1' == d['K1']
+        assert ('k1', 'v1') in d.items()
 
     def test_delitem(self, cls):
         d = cls()
@@ -269,6 +269,7 @@ def test_copy(self, cls):
 
         d2 = d1.copy()
         assert d1 == d2
+        assert d1.items() == d2.items()
         assert d1 is not d2
 
     def test__repr__(self, cls):
@@ -285,18 +286,22 @@ def test_add(self, cls):
 
         assert d == {}
         d['KEY'] = 'one'
+        assert ('KEY', 'one') in d.items()
         assert d == cls({'Key': 'one'})
         assert d.getall('key') == ['one']
 
         d['KEY'] = 'two'
+        assert ('KEY', 'two') in d.items()
         assert d == cls({'Key': 'two'})
         assert d.getall('key') == ['two']
 
         d.add('KEY', 'one')
+        assert ('KEY', 'one') in d.items()
         assert 2 == len(d)
         assert d.getall('key') == ['two', 'one']
 
         d.add('FOO', 'bar')
+        assert ('FOO', 'bar') in d.items()
         assert 3 == len(d)
         assert d.getall('foo') == ['bar']
 
@@ -353,14 +358,15 @@ def test_del(self, cls):
         assert d == {'foo': 'bar'}
         assert list(d.items()) == [('foo', 'bar')]
 
-        with pytest.raises(KeyError):
+        with pytest.raises(KeyError, match='key'):
             del d['key']
 
     def test_set_default(self, cls):
         d = cls([('KEY', 'one'), ('key', 'two')], foo='bar')
         assert 'one' == d.setdefault('key', 'three')
         assert 'three' == d.setdefault('otherkey', 'three')
         assert 'otherkey' in d
+        assert ('otherkey', 'three') in d.items()
         assert 'three' == d['OTHERKEY']
 
     def test_popitem(self, cls):
@@ -404,7 +410,7 @@ def test_pop_default(self, cls):
     def test_pop_raises(self, cls):
         d = cls(OTHER='val')
 
-        with pytest.raises(KeyError):
+        with pytest.raises(KeyError, match="KEY"):
             d.pop('KEY')
 
         assert 'other' in d