asyncio.CancelledError does not subclass Exception

CancelledError does not subclass Exception anymore since 3.8 (and correctly so), but this broke control flow at a couple location and was annoying to debug.

Author: FichteFoll

asyncio_pool/base_pool.py

@@ -106,7 +106,7 @@ async def _wrap(self, coro, future, cb=None, ctx=None):
  res, exc, tb = None, None, None
  try:
  res = await coro
- except Exception as _exc:
+ except BaseException as _exc:
  exc = _exc
  tb = traceback.format_exc()
  finally:
@@ -140,7 +140,7 @@ async def _spawn(self, future, coro, cb=None, ctx=None):
  acq_error = False
  try:
  await self.semaphore.acquire()
- except Exception as e:
+ except BaseException as e:
  acq_error = True
  if not future.done():
  future.set_exception(e)

asyncio_pool/results.py

@@ -14,7 +14,7 @@ def result_noraise(future, flat=True):
  try:
  res = future.result()
  return res if flat else (res, None)
- except Exception as exc:
+ except BaseException as exc:
  return exc if flat else (None, exc)
 
 

examples/_usage.py

@@ -110,7 +110,7 @@ async def cb(res, err, ctx): # callback
  # results.append(getres.flat(fut))
  try:
  results.append(fut.result())
- except Exception as e:
+ except BaseException as e:
  results.append(e)
 
  # First error happens for n == 0 in wrk, exception of it is passed to