Fix tests

Author: asvetlov

aiopg/cursor.py

@@ -107,7 +107,7 @@ def execute(self, operation, parameters=None, *, timeout=None):
             logger.info("%r", parameters)
         try:
             self._impl.execute(operation, parameters)
-        except:
+        except BaseException:
             self._conn._waiter = None
             raise
         try:
@@ -141,7 +141,7 @@ def callproc(self, procname, parameters=None, *, timeout=None):
             logger.info("%r", parameters)
         try:
             self._impl.callproc(procname, parameters)
-        except:
+        except BaseException:
             self._conn._waiter = None
             raise
         else:

aiopg/sa/result.py

@@ -379,9 +379,9 @@ def fetchall(self):
         except AttributeError:
             self._non_result()
         else:
-            l = self._process_rows(rows)
+            res = self._process_rows(rows)
             self.close()
-            return l
+            return res
 
     @asyncio.coroutine
     def fetchone(self):
@@ -417,10 +417,10 @@ def fetchmany(self, size=None):
         except AttributeError:
             self._non_result()
         else:
-            l = self._process_rows(rows)
-            if len(l) == 0:
+            res = self._process_rows(rows)
+            if len(res) == 0:
                 self.close()
-            return l
+            return res
 
     @asyncio.coroutine
     def first(self):

aiopg/utils.py

@@ -266,5 +266,5 @@ def __exit__(self, *args):
         from asyncio import coroutines
 
         coroutines._COROUTINE_TYPES += (_ContextManager,)
-    except:
+    except BaseException:
         pass