Merge branch '0.16'

Author: asvetlov

CHANGES.txt

@@ -17,11 +17,20 @@ CHANGES
 
 - Fix keep-alive support for aiohttp clients #406
 
+
+0.16.4 (06-13-2015)
+-------------------
+
+- Don't clear current exception in multidict's `__repr__` (cythonized
+  versions) #410
+
+
 0.16.3 (05-30-2015)
 -------------------
 
 - Fix StaticRoute vulnerability to directory traversal attacks #380
 
+
 0.16.2 (05-27-2015)
 -------------------
 

aiohttp/_multidict.pyx

@@ -108,7 +108,10 @@ cdef class _Base:
         return _ValuesView.__new__(_ValuesView, self._items)
 
     def __repr__(self):
-        body = ', '.join("'{}': {!r}".format(k, v) for k, v in self.items())
+        lst = []
+        for k, v in self._items:
+            lst.append("'{}': {!r}".format(k, v))
+        body = ', '.join(lst)
         return '<{} {{{}}}>'.format(self.__class__.__name__, body)
 
     def __richcmp__(self, other, op):

tests/test_multidict.py

@@ -215,6 +215,14 @@ def test_isdisjoint2(self):
         d = self.make_dict([('key', 'value1')])
         self.assertFalse(d.keys().isdisjoint({'key'}))
 
+    def test_clear_exception_issue_410(self):
+        d = self.make_dict()
+        try:
+            raise Exception
+        except Exception:
+            repr(d)
+            self.assertIsNotNone(sys.exc_info()[0])
+
 
 class _MultiDictTests(_BaseTest):