Merge pull request #3024 from CoolCat467/ruff-preview-mode

Author: CoolCat467

notes-to-self/how-does-windows-so-reuseaddr-work.py

@@ -49,12 +49,15 @@ def table_entry(mode1, bind_type1, mode2, bind_type2):
     """
                                                        second bind
                                | """
-    + " | ".join(["%-19s" % mode for mode in modes]),
+    + " | ".join(f"{mode:<19}" for mode in modes),
 )
 
 print("""                              """, end="")
 for _ in modes:
-    print(" | " + " | ".join(["%8s" % bind_type for bind_type in bind_types]), end="")
+    print(
+        " | " + " | ".join(f"{bind_type:>8}" for bind_type in bind_types),
+        end="",
+    )
 
 print(
     """
@@ -72,5 +75,5 @@ def table_entry(mode1, bind_type1, mode2, bind_type2):
                 # print(mode1, bind_type1, mode2, bind_type2, entry)
         print(
             f"{mode1:>19} | {bind_type1:>8} | "
-            + " | ".join(["%8s" % entry for entry in row]),
+            + " | ".join(f"{entry:>8}" for entry in row),
         )

notes-to-self/socket-scaling.py

@@ -32,7 +32,7 @@ def pt(desc, *, count=total, item="socket"):
             now = time.perf_counter()
             total_ms = (now - last_time) * 1000
             per_us = total_ms * 1000 / count
-            print(f"{desc}: {total_ms:.2f} ms total, {per_us:.2f} µs/{item}")
+            print(f"{desc}: {total_ms:.2f} ms total, {per_us:.2f} μs/{item}")
             last_time = now
 
         print(f"\n-- {total} sockets --")

notes-to-self/thread-dispatch-bench.py

@@ -30,7 +30,7 @@ def main():
             in_q.put(lambda: None)
             out_q.get()
         end = time.monotonic()
-        print(f"{(end - start) / COUNT * 1e6:.2f} µs/job")
+        print(f"{(end - start) / COUNT * 1e6:.2f} μs/job")
 
 
 main()

notes-to-self/trivial-err.py

@@ -5,7 +5,7 @@
 sys.stderr = sys.stdout
 
 
-async def child1():
+async def child1():  # noqa: RUF029  # async not required
     raise ValueError
 
 
@@ -15,11 +15,11 @@ async def child2():
         nursery.start_soon(grandchild2)
 
 
-async def grandchild1():
+async def grandchild1():  # noqa: RUF029  # async not required
     raise KeyError
 
 
-async def grandchild2():
+async def grandchild2():  # noqa: RUF029  # async not required
     raise NameError("Bob")
 
 

notes-to-self/trivial.py

@@ -1,7 +1,7 @@
 import trio
 
 
-async def foo():
+async def foo():  # noqa: RUF029  # await not used
     print("in foo!")
     return 3
 

pyproject.toml

@@ -102,6 +102,7 @@ extend-exclude = [
 ]
 
 [tool.ruff.lint]
+preview = true
 allowed-confusables = ["–"]
 
 select = [
@@ -147,10 +148,20 @@ extend-ignore = [
 # to export for public use.
 'src/trio/__init__.py' = ['F401']
 'src/trio/_core/__init__.py' = ['F401']
-'src/trio/abc.py' = ['F401']
+'src/trio/abc.py' = ['F401', 'A005']
 'src/trio/lowlevel.py' = ['F401']
-'src/trio/socket.py' = ['F401']
+'src/trio/socket.py' = ['F401', 'A005']
 'src/trio/testing/__init__.py' = ['F401']
+# RUF029 is ignoring tests that are marked as async functions but
+# do not use an await in their function bodies. There are several
+# places where internal trio synchronous code relies on being
+# called from an async function, where current task is set up.
+'src/trio/_tests/*.py' = ['RUF029']
+'src/trio/_core/_tests/*.py' = ['RUF029']
+# A005 is ignoring modules that shadow stdlib modules.
+'src/trio/_abc.py' = ['A005']
+'src/trio/_socket.py' = ['A005']
+'src/trio/_ssl.py' = ['A005']
 
 [tool.ruff.lint.isort]
 combine-as-imports = true

src/trio/_core/_entry_queue.py

@@ -64,7 +64,9 @@ def run_cb(job: Job) -> None:
                 sync_fn(*args)
             except BaseException as exc:
 
-                async def kill_everything(exc: BaseException) -> NoReturn:
+                async def kill_everything(  # noqa: RUF029  # await not used
+                    exc: BaseException,
+                ) -> NoReturn:
                     raise exc
 
                 try:
@@ -139,7 +141,7 @@ def run_sync_soon(
             # wakeup call might trigger an OSError b/c the IO manager has
             # already been shut down.
             if idempotent:
-                self.idempotent_queue[(sync_fn, args)] = None
+                self.idempotent_queue[sync_fn, args] = None
             else:
                 self.queue.append((sync_fn, args))
             self.wakeup.wakeup_thread_and_signal_safe()

src/trio/_core/_tests/test_asyncgen.py

@@ -110,7 +110,7 @@ async def agen() -> AsyncGenerator[int, None]:
     await _core.wait_all_tasks_blocked()
     assert record == ["crashing"]
     # Following type ignore is because typing for LogCaptureFixture is wrong
-    exc_type, exc_value, exc_traceback = caplog.records[0].exc_info  # type: ignore[misc]
+    exc_type, exc_value, _exc_traceback = caplog.records[0].exc_info  # type: ignore[misc]
     assert exc_type is ValueError
     assert str(exc_value) == "oops"
     assert "during finalization of async generator" in caplog.records[0].message
@@ -227,8 +227,8 @@ async def async_main() -> None:
     # failure as small as we want.
     for _attempt in range(50):
         needs_retry = False
-        del record[:]
-        del saved[:]
+        record.clear()
+        saved.clear()
         _core.run(async_main)
         if needs_retry:  # pragma: no cover
             assert record == ["cleaned up"]

src/trio/_core/_tests/test_instrumentation.py

@@ -204,7 +204,7 @@ async def main() -> Task:
     assert ("after_run", None) in r.record
     # And we got a log message
     assert caplog.records[0].exc_info is not None
-    exc_type, exc_value, exc_traceback = caplog.records[0].exc_info
+    exc_type, exc_value, _exc_traceback = caplog.records[0].exc_info
     assert exc_type is ValueError
     assert str(exc_value) == "oops"
     assert "Instrument has been disabled" in caplog.records[0].message

src/trio/_core/_tests/test_io.py

@@ -161,7 +161,7 @@ async def block_on_write() -> None:
 
 @read_socket_test
 async def test_double_read(socketpair: SocketPair, wait_readable: WaitSocket) -> None:
-    a, b = socketpair
+    a, _b = socketpair
 
     # You can't have two tasks trying to read from a socket at the same time
     async with _core.open_nursery() as nursery:
@@ -174,7 +174,7 @@ async def test_double_read(socketpair: SocketPair, wait_readable: WaitSocket) ->
 
 @write_socket_test
 async def test_double_write(socketpair: SocketPair, wait_writable: WaitSocket) -> None:
-    a, b = socketpair
+    a, _b = socketpair
 
     # You can't have two tasks trying to write to a socket at the same time
     fill_socket(a)
@@ -195,7 +195,7 @@ async def test_interrupted_by_close(
     wait_writable: WaitSocket,
     notify_closing: Callable[[stdlib_socket.socket], object],
 ) -> None:
-    a, b = socketpair
+    a, _b = socketpair
 
     async def reader() -> None:
         with pytest.raises(_core.ClosedResourceError):