Get rid of using __ for positional only arguments

Author: A5rocks

src/trio/_socket.py

@@ -1,6 +1,3 @@
-# ruff: noqa: PYI063  # Several cases throughout file where
-# argument names with __ used because of typeshed, see comment for recv in _SocketType
-
 from __future__ import annotations
 
 import os
@@ -677,11 +674,12 @@ async def accept(self) -> tuple[SocketType, AddressFormat]:
     async def connect(self, address: AddressFormat) -> None:
         raise NotImplementedError
 
-    def recv(__self, __buflen: int, __flags: int = 0) -> Awaitable[bytes]:
+    def recv(self, buflen: int, flags: int = 0, /) -> Awaitable[bytes]:
         raise NotImplementedError
 
     def recv_into(
-        __self,
+        self,
+        /,
         buffer: Buffer,
         nbytes: int = 0,
         flags: int = 0,
@@ -690,15 +688,17 @@ def recv_into(
 
     # return type of socket.socket.recvfrom in typeshed is tuple[bytes, Any]
     def recvfrom(
-        __self,
-        __bufsize: int,
-        __flags: int = 0,
+        self,
+        bufsize: int,
+        flags: int = 0,
+        /,
     ) -> Awaitable[tuple[bytes, AddressFormat]]:
         raise NotImplementedError
 
     # return type of socket.socket.recvfrom_into in typeshed is tuple[bytes, Any]
     def recvfrom_into(
-        __self,
+        self,
+        /,
         buffer: Buffer,
         nbytes: int = 0,
         flags: int = 0,
@@ -710,10 +710,11 @@ def recvfrom_into(
     ):
 
         def recvmsg(
-            __self,
-            __bufsize: int,
-            __ancbufsize: int = 0,
-            __flags: int = 0,
+            self,
+            bufsize: int,
+            ancbufsize: int = 0,
+            flags: int = 0,
+            /,
         ) -> Awaitable[tuple[bytes, list[tuple[int, int, bytes]], int, object]]:
             raise NotImplementedError
 
@@ -722,29 +723,32 @@ def recvmsg(
     ):
 
         def recvmsg_into(
-            __self,
-            __buffers: Iterable[Buffer],
-            __ancbufsize: int = 0,
-            __flags: int = 0,
+            self,
+            buffers: Iterable[Buffer],
+            ancbufsize: int = 0,
+            flags: int = 0,
+            /,
         ) -> Awaitable[tuple[int, list[tuple[int, int, bytes]], int, object]]:
             raise NotImplementedError
 
-    def send(__self, __bytes: Buffer, __flags: int = 0) -> Awaitable[int]:
+    def send(self, bytes: Buffer, flags: int = 0, /) -> Awaitable[int]:
         raise NotImplementedError
 
     @overload
     async def sendto(
         self,
-        __data: Buffer,
-        __address: tuple[object, ...] | str | Buffer,
+        data: Buffer,
+        address: tuple[object, ...] | str | Buffer,
+        /,
     ) -> int: ...
 
     @overload
     async def sendto(
         self,
-        __data: Buffer,
-        __flags: int,
-        __address: tuple[object, ...] | str | Buffer,
+        data: Buffer,
+        flags: int,
+        address: tuple[object, ...] | str | Buffer,
+        /,
     ) -> int: ...
 
     async def sendto(self, *args: object) -> int:
@@ -757,10 +761,11 @@ async def sendto(self, *args: object) -> int:
         @_wraps(_stdlib_socket.socket.sendmsg, assigned=(), updated=())
         async def sendmsg(
             self,
-            __buffers: Iterable[Buffer],
-            __ancdata: Iterable[tuple[int, int, Buffer]] = (),
-            __flags: int = 0,
-            __address: AddressFormat | None = None,
+            buffers: Iterable[Buffer],
+            ancdata: Iterable[tuple[int, int, Buffer]] = (),
+            flags: int = 0,
+            address: AddressFormat | None = None,
+            /,
         ) -> int:
             raise NotImplementedError
 
@@ -1118,11 +1123,8 @@ async def connect(self, address: AddressFormat) -> None:
     # complain about AmbiguousType
     if TYPE_CHECKING:
 
-        def recv(__self, __buflen: int, __flags: int = 0) -> Awaitable[bytes]: ...
+        def recv(self, buflen: int, flags: int = 0, /) -> Awaitable[bytes]: ...
 
-    # _make_simple_sock_method_wrapper is typed, so this checks that the above is correct
-    # this requires that we refrain from using `/` to specify pos-only
-    # args, or mypy thinks the signature differs from typeshed.
     recv = _make_simple_sock_method_wrapper(
         _stdlib_socket.socket.recv,
         _core.wait_readable,
@@ -1135,7 +1137,8 @@ def recv(__self, __buflen: int, __flags: int = 0) -> Awaitable[bytes]: ...
     if TYPE_CHECKING:
 
         def recv_into(
-            __self,
+            self,
+            /,
             buffer: Buffer,
             nbytes: int = 0,
             flags: int = 0,
@@ -1153,9 +1156,10 @@ def recv_into(
     if TYPE_CHECKING:
         # return type of socket.socket.recvfrom in typeshed is tuple[bytes, Any]
         def recvfrom(
-            __self,
-            __bufsize: int,
-            __flags: int = 0,
+            self,
+            bufsize: int,
+            flags: int = 0,
+            /,
         ) -> Awaitable[tuple[bytes, AddressFormat]]: ...
 
     recvfrom = _make_simple_sock_method_wrapper(
@@ -1170,7 +1174,8 @@ def recvfrom(
     if TYPE_CHECKING:
         # return type of socket.socket.recvfrom_into in typeshed is tuple[bytes, Any]
         def recvfrom_into(
-            __self,
+            self,
+            /,
             buffer: Buffer,
             nbytes: int = 0,
             flags: int = 0,
@@ -1191,10 +1196,11 @@ def recvfrom_into(
         if TYPE_CHECKING:
 
             def recvmsg(
-                __self,
-                __bufsize: int,
-                __ancbufsize: int = 0,
-                __flags: int = 0,
+                self,
+                bufsize: int,
+                ancbufsize: int = 0,
+                flags: int = 0,
+                /,
             ) -> Awaitable[tuple[bytes, list[tuple[int, int, bytes]], int, object]]: ...
 
         recvmsg = _make_simple_sock_method_wrapper(
@@ -1213,10 +1219,11 @@ def recvmsg(
         if TYPE_CHECKING:
 
             def recvmsg_into(
-                __self,
-                __buffers: Iterable[Buffer],
-                __ancbufsize: int = 0,
-                __flags: int = 0,
+                self,
+                buffers: Iterable[Buffer],
+                ancbufsize: int = 0,
+                flags: int = 0,
+                /,
             ) -> Awaitable[tuple[int, list[tuple[int, int, bytes]], int, object]]: ...
 
         recvmsg_into = _make_simple_sock_method_wrapper(
@@ -1231,7 +1238,7 @@ def recvmsg_into(
 
     if TYPE_CHECKING:
 
-        def send(__self, __bytes: Buffer, __flags: int = 0) -> Awaitable[int]: ...
+        def send(self, bytes: Buffer, flags: int = 0, /) -> Awaitable[int]: ...
 
     send = _make_simple_sock_method_wrapper(
         _stdlib_socket.socket.send,
@@ -1245,16 +1252,18 @@ def send(__self, __bytes: Buffer, __flags: int = 0) -> Awaitable[int]: ...
     @overload
     async def sendto(
         self,
-        __data: Buffer,
-        __address: tuple[object, ...] | str | Buffer,
+        data: Buffer,
+        address: tuple[object, ...] | str | Buffer,
+        /,
     ) -> int: ...
 
     @overload
     async def sendto(
         self,
-        __data: Buffer,
-        __flags: int,
-        __address: tuple[object, ...] | str | Buffer,
+        data: Buffer,
+        flags: int,
+        address: tuple[object, ...] | str | Buffer,
+        /,
     ) -> int: ...
 
     @_wraps(_stdlib_socket.socket.sendto, assigned=(), updated=())
@@ -1287,6 +1296,7 @@ async def sendmsg(
             ancdata: Iterable[tuple[int, int, Buffer]] = (),
             flags: int = 0,
             address: AddressFormat | None = None,
+            /,
         ) -> int:
             """Similar to :meth:`socket.socket.sendmsg`, but async.