Merge branch '1.2'

aio-libs · Aug 2, 2016 · 89d5766 · 89d5766
2 parents 85c27b7 + 270c496
commit 89d5766
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -65,3 +65,4 @@ target/
 .install-deps
 
 multidict/_multidict.html
+multidict/_multidict.c
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,9 @@
+2.0.1 (2016-08-02)
+------------------
+
+* Don't crash on `{} - MultiDict().keys()` and similar operations #6
+
+
 2.0.0 (2016-07-28)
 ------------------
 
@@ -6,6 +12,11 @@
 
 * Deprecase `upstr` class in favor of `istr` alias.
 
+1.2.2 (2016-08-02)
+------------------
+
+* Don't crash on `{} - MultiDict().keys()` and similar operations #6
+
 1.2.1 (2016-07-21)
 ------------------
 

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