Merge pull request #425 from jkloetzke/fix-py39

builder: catch the correct CancelledError
BobBuildTool · Jul 21, 2021 · 171acf3 · 171acf3
2 parents 6288112 + f7afc15
commit 171acf3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pym/bob/cmds/build/builder.py b/pym/bob/cmds/build/builder.py
@@ -744,7 +744,7 @@ async def __taskWrapper(self, coro, trackingKey=None, tracker=None,
             raise CancelBuildException
         except CancelBuildException:
             raise
-        except concurrent.futures.CancelledError:
+        except asyncio.CancelledError:
             raise CancelBuildException
         except Exception as e:
             self.__buildErrors.append(e)
@@ -804,7 +804,7 @@ async def dispatcher():
                 loop.run_until_complete(j)
             except CancelBuildException:
                 pass
-            except concurrent.futures.CancelledError:
+            except asyncio.CancelledError:
                 pass
             finally:
                 try:
@@ -1668,7 +1668,7 @@ async def __yieldJobWhile(self, coro, ignoreExecutionStop = False):
                 try:
                     await self.__runners.acquire()
                     acquired = True
-                except concurrent.futures.CancelledError:
+                except asyncio.CancelledError:
                     pass
         if not self.__running and not ignoreExecutionStop: raise CancelBuildException
         return ret