fix ruff warnings

Author: dhalbert

asyncio/funcs.py

@@ -168,14 +168,13 @@ def done(t, er):
         elif isinstance(ts[i].data, StopIteration):
             # Sub-task ran to completion, get its return value.
             ts[i] = ts[i].data.value
-        else:
-            # Sub-task had an exception.
-            if return_exceptions:
-                # Get the sub-task exception to return in the list of return values.
-                ts[i] = ts[i].data
-            elif isinstance(state, int):
-                # Raise the sub-task exception, if there is not already an exception to raise.
-                state = ts[i].data
+        # Sub-task had an exception.
+        elif return_exceptions:
+            # Get the sub-task exception to return in the list of return values.
+            ts[i] = ts[i].data
+        elif isinstance(state, int):
+            # Raise the sub-task exception, if there is not already an exception to raise.
+            state = ts[i].data
 
     # Either this gather was cancelled, or one of the sub-tasks raised an exception with
     # return_exceptions==False, so reraise the exception here.

asyncio/task.py

@@ -198,16 +198,18 @@ def cancel(self):
         if self is core.cur_task:
             raise RuntimeError("can't cancel self")
         # If Task waits on another task then forward the cancel to the one it's waiting on.
-        while isinstance(self.data, Task):
-            self = self.data
+        # CIRCUITPY-CHANGE: don't reassign self
+        task = self
+        while isinstance(task.data, Task):
+            task = task.data
         # Reschedule Task as a cancelled task.
-        if hasattr(self.data, "remove"):
+        if hasattr(task.data, "remove"):
             # Not on the main running queue, remove the task from the queue it's on.
-            self.data.remove(self)
-            core._task_queue.push(self)
-        elif core.ticks_diff(self.ph_key, core.ticks()) > 0:
+            task.data.remove(task)
+            core._task_queue.push(task)
+        elif core.ticks_diff(task.ph_key, core.ticks()) > 0:
             # On the main running queue but scheduled in the future, so bring it forward to now.
-            core._task_queue.remove(self)
-            core._task_queue.push(self)
-        self.data = core.CancelledError
+            core._task_queue.remove(task)
+            core._task_queue.push(task)
+        task.data = core.CancelledError
         return True

asyncio/traceback.py

@@ -29,7 +29,8 @@ def _print_traceback(traceback, limit=None, file=sys.stderr) -> List[str]:
         name = frame_code.co_name
         print(f'  File "{filename}", line {line_number}, in {name}', file=file)
         traceback = traceback.tb_next
-        n = n + 1
+        # CIRCUITPY-CHANGE: use +=
+        n += 1
         if limit is not None and n >= limit:
             break