Fix several things from review

Co-authored-by: A5rocks <[email protected]>

Author: CoolCat467

src/trio/_core/_tests/test_mock_clock.py

@@ -92,7 +92,8 @@ async def test_mock_clock_autojump(mock_clock: MockClock) -> None:
     mock_clock.autojump_threshold = 0
     # if the above line didn't take affect immediately, then this would be
     # bad:
-    await sleep(100000)  # noqa: ASYNC116  # not sleep_forever
+    # ignore ASYNC116, not sleep_forever, trying to test a large but finite sleep
+    await sleep(100000)  # noqa: ASYNC116
 
 
 async def test_mock_clock_autojump_interference(mock_clock: MockClock) -> None:

src/trio/_socket.py

@@ -682,11 +682,9 @@ async def accept(self) -> tuple[SocketType, AddressFormat]:
     async def connect(self, address: AddressFormat) -> None:
         raise NotImplementedError
 
-    # argument names with __ used because of typeshed, see comment for recv in _SocketType
     def recv(__self, __buflen: int, __flags: int = 0) -> Awaitable[bytes]:
         raise NotImplementedError
 
-    # argument names with __ used because of typeshed, see comment for recv in _SocketType
     def recv_into(
         __self,
         buffer: Buffer,
@@ -695,7 +693,6 @@ def recv_into(
     ) -> Awaitable[int]:
         raise NotImplementedError
 
-    # argument names with __ used because of typeshed, see comment for recv in _SocketType
     # return type of socket.socket.recvfrom in typeshed is tuple[bytes, Any]
     def recvfrom(
         __self,
@@ -716,7 +713,7 @@ def recvfrom_into(
     if sys.platform != "win32" or (
         not TYPE_CHECKING and hasattr(_stdlib_socket.socket, "recvmsg")
     ):
-        # argument names with __ used because of typeshed, see comment for recv in _SocketType
+
         def recvmsg(
             __self,
             __bufsize: int,
@@ -728,7 +725,7 @@ def recvmsg(
     if sys.platform != "win32" or (
         not TYPE_CHECKING and hasattr(_stdlib_socket.socket, "recvmsg_into")
     ):
-        # argument names with __ used because of typeshed, see comment for recv in _SocketType
+
         def recvmsg_into(
             __self,
             __buffers: Iterable[Buffer],
@@ -737,19 +734,16 @@ def recvmsg_into(
         ) -> Awaitable[tuple[int, list[tuple[int, int, bytes]], int, Any]]:
             raise NotImplementedError
 
-    # argument names with __ used because of typeshed, see comment for recv in _SocketType
     def send(__self, __bytes: Buffer, __flags: int = 0) -> Awaitable[int]:
         raise NotImplementedError
 
-    # argument names with __ used because of typeshed, see comment for recv in _SocketType
     @overload
     async def sendto(
         self,
         __data: Buffer,
         __address: tuple[object, ...] | str | Buffer,
     ) -> int: ...
 
-    # argument names with __ used because of typeshed, see comment for recv in _SocketType
     @overload
     async def sendto(
         self,
@@ -764,7 +758,7 @@ async def sendto(self, *args: Any) -> int:
     if sys.platform != "win32" or (
         not TYPE_CHECKING and hasattr(_stdlib_socket.socket, "sendmsg")
     ):
-        # argument names with __ used because of typeshed, see comment for recv in _SocketType
+
         @_wraps(_stdlib_socket.socket.sendmsg, assigned=(), updated=())
         async def sendmsg(
             self,
@@ -1144,7 +1138,7 @@ def recv(__self, __buflen: int, __flags: int = 0) -> Awaitable[bytes]: ...
     ################################################################
 
     if TYPE_CHECKING:
-        # argument names with __ used because of typeshed, see comment for recv in _SocketType
+
         def recv_into(
             __self,
             buffer: Buffer,
@@ -1162,7 +1156,6 @@ def recv_into(
     ################################################################
 
     if TYPE_CHECKING:
-        # argument names with __ used because of typeshed, see comment for recv in _SocketType
         # return type of socket.socket.recvfrom in typeshed is tuple[bytes, Any]
         def recvfrom(
             __self,
@@ -1201,7 +1194,7 @@ def recvfrom_into(
         not TYPE_CHECKING and hasattr(_stdlib_socket.socket, "recvmsg")
     ):
         if TYPE_CHECKING:
-            # argument names with __ used because of typeshed, see comment for recv in _SocketType
+
             def recvmsg(
                 __self,
                 __bufsize: int,
@@ -1223,7 +1216,7 @@ def recvmsg(
         not TYPE_CHECKING and hasattr(_stdlib_socket.socket, "recvmsg_into")
     ):
         if TYPE_CHECKING:
-            # argument names with __ used because of typeshed, see comment for recv in _SocketType
+
             def recvmsg_into(
                 __self,
                 __buffers: Iterable[Buffer],
@@ -1242,7 +1235,7 @@ def recvmsg_into(
     ################################################################
 
     if TYPE_CHECKING:
-        # argument names with __ used because of typeshed, see comment for recv in _SocketType
+
         def send(__self, __bytes: Buffer, __flags: int = 0) -> Awaitable[int]: ...
 
     send = _make_simple_sock_method_wrapper(
@@ -1254,15 +1247,13 @@ def send(__self, __bytes: Buffer, __flags: int = 0) -> Awaitable[int]: ...
     # sendto
     ################################################################
 
-    # argument names with __ used because of typeshed, see comment for recv in _SocketType
     @overload
     async def sendto(
         self,
         __data: Buffer,
         __address: tuple[object, ...] | str | Buffer,
     ) -> int: ...
 
-    # argument names with __ used because of typeshed, see comment for recv in _SocketType
     @overload
     async def sendto(
         self,
@@ -1293,7 +1284,7 @@ async def sendto(self, *args: Any) -> int:
     if sys.platform != "win32" or (
         not TYPE_CHECKING and hasattr(_stdlib_socket.socket, "sendmsg")
     ):
-        # argument names with __ used because of typeshed, see comment for recv in _SocketType
+
         @_wraps(_stdlib_socket.socket.sendmsg, assigned=(), updated=())
         async def sendmsg(
             self,

src/trio/_tests/test_ssl.py

@@ -707,7 +707,8 @@ async def expect(expected: bytes) -> None:
     # Our receive_some() call will get stuck when it hits send_all
     async def sleeper_with_slow_send_all(method: str) -> None:
         if method == "send_all":
-            await trio.sleep(100000)  # noqa: ASYNC116  # not sleep forever
+            # ignore ASYNC116, not sleep_forever, trying to test a large but finite sleep
+            await trio.sleep(100000)  # noqa: ASYNC116
 
     # And our wait_send_all_might_not_block call will give it time to get
     # stuck, and then start

src/trio/_tools/gen_exports.py

@@ -302,7 +302,8 @@ def process(files: Iterable[File], *, do_test: bool) -> None:
             print("Generated sources are up to date.")
     else:
         for new_path, new_source in new_files.items():
-            Path(new_path).write_text(new_source, encoding="utf-8")
+            with open(new_path, "w", encoding="utf-8", newline="\n") as fp:
+                fp.write(new_source)
         print("Regenerated sources successfully.")
         if not matches_disk:
             # With pre-commit integration, show that we edited files.