Apply last reviews

Author: YvesDup

Lib/asyncio/tasks.py

@@ -268,10 +268,9 @@ def __step(self, exc=None):
             raise exceptions.InvalidStateError(
                 f'__step(): already done: {self!r}, {exc!r}')
         if self._must_cancel:
-            # gh-108549: do not swallow SystemExit and KeyboardInterrupt
+            # gh-108549: do not swallow SystemExit and KeyboardInterrupt.
             if not isinstance(exc, (exceptions.CancelledError,
-                                   SystemExit, KeyboardInterrupt)
-                              ):
+                                    SystemExit, KeyboardInterrupt)):
                 exc = self._make_cancelled_error()
             self._must_cancel = False
         self._fut_waiter = None

Lib/test/test_asyncio/test_tasks.py

@@ -1904,6 +1904,7 @@ async def current_task(exc):
                 pass
             except BaseException as e:
                 self.fail(f'{exc} is expected, instead of {type(e)}')
+            return "ok"
 
         for exc in (SystemExit, KeyboardInterrupt):
             with self.subTest(exc):
@@ -1912,6 +1913,7 @@ async def current_task(exc):
                 t.cancel()
                 test_utils.run_briefly(self.loop)
                 self.assertTrue(not t.cancelled())
+                self.assertEqual(t.result(), "ok")
 
     def test_step_result_future(self):
         # If coroutine returns future, task waits on this future.