Bumpt to 2.1.3

aio-libs · Nov 26, 2016 · 083b3bc · 083b3bc
1 parent aa208e8
commit 083b3bc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,9 @@
+2.1.3 (2016-11-26)
+------------------
+
+* Add a fastpath for multidict extending by multidict
+
+
 2.1.2 (2016-09-25)
 ------------------
 

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

diff --git a/multidict/_multidict.pyx b/multidict/_multidict.pyx
@@ -260,7 +260,9 @@ cdef class MultiDict(_Base):
 
         if args:
             arg = args[0]
-            if isinstance(arg, _Base):
+            if isinstance(arg, CIMultiDict):
+                self._items.extend((<_Base>arg)._items)
+            elif isinstance(arg, _Base):
                 for i in (<_Base>arg)._items:
                     item = <_Pair>i
                     key = self._title(item._key)