Fix CIMultiDict constructor for case of accepting istr #11

aio-libs · Sep 22, 2016 · c79c3a3 · c79c3a3
1 parent f7a11f4
commit c79c3a3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,9 @@
+2.1.1 (2016-09-22)
+------------------
+
+* Fix `CIMultiDict` constructor for case of accepting `istr` #11
+
+
 2.1.0 (2016-09-18)
 ------------------
 

diff --git a/multidict/__init__.py b/multidict/__init__.py
@@ -10,7 +10,7 @@
 __all__ = ('MultiDictProxy', 'CIMultiDictProxy',
            'MultiDict', 'CIMultiDict', 'upstr', 'istr')
 
-__version__ = '2.1.0'
+__version__ = '2.1.1'
 
 
 if bool(os.environ.get('MULTIDICT_NO_EXTENSIONS')):

diff --git a/multidict/_multidict.pyx b/multidict/_multidict.pyx
@@ -252,7 +252,7 @@ cdef class MultiDict(_Base):
 
     cdef _extend(self, tuple args, dict kwargs, name, int do_add):
         cdef _Pair item
-        cdef str key
+        cdef object key
 
         if len(args) > 1:
             raise TypeError("{} takes at most 1 positional argument"
@@ -308,7 +308,7 @@ cdef class MultiDict(_Base):
             else:
                 self._replace(key, value)
 
-    cdef _add(self, str key, value):
+    cdef _add(self, key, value):
         self._items.append(_Pair.__new__(_Pair, key, value))
 
     cdef _replace(self, str key, value):

diff --git a/tests/test_multidict.py b/tests/test_multidict.py
@@ -745,6 +745,11 @@ def test_update(self):
 
         self.assertEqual([('Key2', 'val3'), ('Key', 'val')], list(d.items()))
 
+    def test_copy_istr(self):
+        d = self.make_dict({istr('Foo'): 'bar'})
+        d2 = d.copy()
+        self.assertEqual(d, d2)
+
 
 class TestPyMultiDictProxy(_TestProxy, unittest.TestCase):