Merge pull request #19 from oremanj/acceptmore

Fix some false positives

Author: njsmith

async_generator-stubs/__init__.pyi

@@ -57,13 +57,13 @@ def aclosing(obj: _T_closeable) -> AsyncContextManager[_T_closeable]: ...
 _AsyncGenHooks = NamedTuple(
     "AsyncGenHooks",
     [
-        ("firstiter", Optional[Callable[[AsyncGenerator[Any, Any]], None]]),
-        ("finalizer", Optional[Callable[[AsyncGenerator[Any, Any]], None]]),
+        ("firstiter", Optional[Callable[[AsyncGenerator[Any, Any]], Any]]),
+        ("finalizer", Optional[Callable[[AsyncGenerator[Any, Any]], Any]]),
     ],
 )
 
 def get_asyncgen_hooks() -> _AsyncGenHooks: ...
 def set_asyncgen_hooks(
-    firstiter: Optional[Callable[[AsyncGenerator[Any, Any]], None]] = ...,
-    finalizer: Optional[Callable[[AsyncGenerator[Any, Any]], None]] = ...,
+    firstiter: Optional[Callable[[AsyncGenerator[Any, Any]], Any]] = ...,
+    finalizer: Optional[Callable[[AsyncGenerator[Any, Any]], Any]] = ...,
 ) -> None: ...

trio-stubs/__init__.pyi

@@ -117,15 +117,15 @@ class Nursery(_NotConstructible, metaclass=ABCMeta):
     def start_soon(
         self,
         async_fn: Union[
-            # List these explicitly instead of Callable[..., Awaitable[None]]
+            # List these explicitly instead of Callable[..., Awaitable[Any]]
             # so that even without the plugin we catch cases of passing a
             # function with keyword-only arguments to start_soon().
-            Callable[[], Awaitable[None]],
-            Callable[[Any], Awaitable[None]],
-            Callable[[Any, Any], Awaitable[None]],
-            Callable[[Any, Any, Any], Awaitable[None]],
-            Callable[[Any, Any, Any, Any], Awaitable[None]],
-            Callable[[VarArg()], Awaitable[None]],
+            Callable[[], Awaitable[Any]],
+            Callable[[Any], Awaitable[Any]],
+            Callable[[Any, Any], Awaitable[Any]],
+            Callable[[Any, Any, Any], Awaitable[Any]],
+            Callable[[Any, Any, Any, Any], Awaitable[Any]],
+            Callable[[VarArg()], Awaitable[Any]],
         ],
         *args: Any,
         name: object = None,
@@ -134,24 +134,24 @@ class Nursery(_NotConstructible, metaclass=ABCMeta):
     async def start(
         self,
         async_fn: Union[
-            # List these explicitly instead of Callable[..., Awaitable[None]]
+            # List these explicitly instead of Callable[..., Awaitable[Any]]
             # so that even without the plugin we can infer the return type
             # of start(), and fail when a function is passed that doesn't
             # accept task_status.
-            Callable[[NamedArg(TaskStatus[T], "task_status")], Awaitable[None]],
-            Callable[[Any, NamedArg(TaskStatus[T], "task_status")], Awaitable[None]],
+            Callable[[NamedArg(TaskStatus[T], "task_status")], Awaitable[Any]],
+            Callable[[Any, NamedArg(TaskStatus[T], "task_status")], Awaitable[Any]],
             Callable[
-                [Any, Any, NamedArg(TaskStatus[T], "task_status")], Awaitable[None]
+                [Any, Any, NamedArg(TaskStatus[T], "task_status")], Awaitable[Any]
             ],
             Callable[
-                [Any, Any, Any, NamedArg(TaskStatus[T], "task_status")], Awaitable[None]
+                [Any, Any, Any, NamedArg(TaskStatus[T], "task_status")], Awaitable[Any]
             ],
             Callable[
                 [Any, Any, Any, Any, NamedArg(TaskStatus[T], "task_status")],
-                Awaitable[None],
+                Awaitable[Any],
             ],
             Callable[
-                [VarArg(), NamedArg(TaskStatus[T], "task_status")], Awaitable[None]
+                [VarArg(), NamedArg(TaskStatus[T], "task_status")], Awaitable[Any]
             ],
         ],
         *args: Any,
@@ -433,7 +433,7 @@ class Path(pathlib.PurePath):
 T_resource = TypeVar("T_resource", bound=trio.abc.AsyncResource)
 
 async def serve_listeners(
-    handler: Callable[[T_resource], Awaitable[None]],
+    handler: Callable[[T_resource], Awaitable[Any]],
     listeners: Sequence[trio.abc.Listener[T_resource]],
     *,
     handler_nursery: Optional[Nursery] = None,
@@ -450,7 +450,7 @@ async def open_tcp_listeners(
     port: int, *, host: Optional[AnyStr] = None, backlog: Optional[int] = None
 ) -> Sequence[SocketListener]: ...
 async def serve_tcp(
-    handler: Callable[[SocketStream], Awaitable[None]],
+    handler: Callable[[SocketStream], Awaitable[Any]],
     port: int,
     *,
     host: Optional[AnyStr] = None,
@@ -480,7 +480,7 @@ async def open_ssl_over_tcp_listeners(
     backlog: Optional[int] = None,
 ) -> Sequence[trio.SSLListener]: ...
 async def serve_ssl_over_tcp(
-    handler: Callable[[trio.SSLStream], Awaitable[None]],
+    handler: Callable[[trio.SSLStream], Awaitable[Any]],
     port: int,
     ssl_context: ssl.SSLContext,
     *,
@@ -618,7 +618,7 @@ else:
         shell: Literal[True],
         cwd: str = ...,
         env: Mapping[str, str] = ...,
-        preexec_fn: Optional[Callable[[], None]] = ...,
+        preexec_fn: Optional[Callable[[], Any]] = ...,
         restore_signals: bool = ...,
         start_new_session: bool = ...,
         pass_fds: Sequence[int] = ...,
@@ -634,7 +634,7 @@ else:
         shell: bool = ...,
         cwd: str = ...,
         env: Mapping[str, str] = ...,
-        preexec_fn: Optional[Callable[[], None]] = ...,
+        preexec_fn: Optional[Callable[[], Any]] = ...,
         restore_signals: bool = ...,
         start_new_session: bool = ...,
         pass_fds: Sequence[int] = ...,
@@ -653,7 +653,7 @@ else:
         shell: Literal[True],
         cwd: str = ...,
         env: Mapping[str, str] = ...,
-        preexec_fn: Optional[Callable[[], None]] = ...,
+        preexec_fn: Optional[Callable[[], Any]] = ...,
         restore_signals: bool = ...,
         start_new_session: bool = ...,
         pass_fds: Sequence[int] = ...,
@@ -672,7 +672,7 @@ else:
         shell: bool = ...,
         cwd: str = ...,
         env: Mapping[str, str] = ...,
-        preexec_fn: Optional[Callable[[], None]] = ...,
+        preexec_fn: Optional[Callable[[], Any]] = ...,
         restore_signals: bool = ...,
         start_new_session: bool = ...,
         pass_fds: Sequence[int] = ...,

trio-stubs/hazmat.pyi

@@ -39,7 +39,7 @@ class TrioToken:
     @takes_callable_and_args
     def run_sync_soon(
         self,
-        sync_fn: Union[Callable[..., None], Callable[[VarArg()], None]],
+        sync_fn: Union[Callable[..., Any], Callable[[VarArg()], Any]],
         *args: Any,
         idempotent: bool = False,
     ) -> None: ...
@@ -75,7 +75,7 @@ def reschedule(task: Task, next_send: outcome.Outcome[Any] = ...) -> None: ...
 @takes_callable_and_args
 def spawn_system_task(
     async_fn: Union[
-        Callable[..., Awaitable[None]], Callable[[VarArg()], Awaitable[None]]
+        Callable[..., Awaitable[Any]], Callable[[VarArg()], Awaitable[Any]]
     ],
     *args: Any,
     name: object = ...,

trio-stubs/socket.pyi

@@ -476,8 +476,8 @@ class SocketType:
     def get_inheritable(self) -> bool: ...
     def set_inheritable(self, inheritable: bool) -> None: ...
     def fileno(self) -> int: ...
-    def getpeername(self) -> Union[None, Tuple[Any, ...], str]: ...
-    def getsockname(self) -> Union[None, Tuple[Any, ...], str]: ...
+    def getpeername(self) -> Any: ...
+    def getsockname(self) -> Any: ...
     @overload
     def getsockopt(self, level: int, optname: int) -> int: ...
     @overload

trio-stubs/testing.pyi

@@ -48,8 +48,8 @@ async def check_half_closeable_stream(
     stream_maker: _StreamMaker, clogged_stream_maker: Optional[_StreamMaker]
 ) -> None: ...
 
-MemoryStreamHook = Optional[Callable[[], Awaitable[None]]]
-MemoryStreamSyncHook = Optional[Callable[[], None]]
+MemoryStreamHook = Optional[Callable[[], Awaitable[Any]]]
+MemoryStreamSyncHook = Optional[Callable[[], Any]]
 @attr.s(auto_attribs=True)
 class MemorySendStream(trio.abc.SendStream):
     send_all_hook: MemoryStreamHook = ...

trio_typing/_tests/test-data/async_generator.test

@@ -61,7 +61,7 @@ async def dummy():
 firstiter = agen.get_asyncgen_hooks().firstiter
 if firstiter is not None:
     firstiter(iter([]))  # E: Argument 1 has incompatible type "Iterator[<nothing>]"; expected "AsyncGenerator[Any, Any]"
-    reveal_type(firstiter(dummy()))  # N: Revealed type is 'None'
+    reveal_type(firstiter(dummy()))  # N: Revealed type is 'Any'
     agen.set_asyncgen_hooks(firstiter)
     agen.set_asyncgen_hooks(firstiter, finalizer=firstiter)
 

trio_typing/_tests/test-data/taskstatus.test

@@ -16,12 +16,12 @@ async def child2(
 
 async def parent() -> None:
     async with trio.open_nursery() as nursery:
-        nursery.start_soon(child, 10)  # E: Argument 1 to "start_soon" of "Nursery" has incompatible type "Callable[[int, NamedArg(TaskStatus[int], 'task_status')], Coroutine[Any, Any, None]]"; expected "Callable[[int], Awaitable[None]]"
-        nursery.start_soon(child2)  # E: Argument 1 to "start_soon" of "Nursery" has incompatible type "Callable[[int, DefaultNamedArg(TaskStatus[None], 'task_status')], Coroutine[Any, Any, None]]"; expected "Callable[[], Awaitable[None]]"
-        nursery.start_soon(child2, "hi")  # E: Argument 1 to "start_soon" of "Nursery" has incompatible type "Callable[[int, DefaultNamedArg(TaskStatus[None], 'task_status')], Coroutine[Any, Any, None]]"; expected "Callable[[str], Awaitable[None]]"
+        nursery.start_soon(child, 10)  # E: Argument 1 to "start_soon" of "Nursery" has incompatible type "Callable[[int, NamedArg(TaskStatus[int], 'task_status')], Coroutine[Any, Any, None]]"; expected "Callable[[int], Awaitable[Any]]"
+        nursery.start_soon(child2)  # E: Argument 1 to "start_soon" of "Nursery" has incompatible type "Callable[[int, DefaultNamedArg(TaskStatus[None], 'task_status')], Coroutine[Any, Any, None]]"; expected "Callable[[], Awaitable[Any]]"
+        nursery.start_soon(child2, "hi")  # E: Argument 1 to "start_soon" of "Nursery" has incompatible type "Callable[[int, DefaultNamedArg(TaskStatus[None], 'task_status')], Coroutine[Any, Any, None]]"; expected "Callable[[str], Awaitable[Any]]"
         nursery.start_soon(child2, 50)
-        await nursery.start(child)  # E: Argument 1 to "start" of "Nursery" has incompatible type "Callable[[int, NamedArg(TaskStatus[int], 'task_status')], Coroutine[Any, Any, None]]"; expected "Callable[[NamedArg(TaskStatus[<nothing>], 'task_status')], Awaitable[None]]"
-        await nursery.start(child, "hi")  # E: Argument 1 to "start" of "Nursery" has incompatible type "Callable[[int, NamedArg(TaskStatus[int], 'task_status')], Coroutine[Any, Any, None]]"; expected "Callable[[str, NamedArg(TaskStatus[int], 'task_status')], Awaitable[None]]"
+        await nursery.start(child)  # E: Argument 1 to "start" of "Nursery" has incompatible type "Callable[[int, NamedArg(TaskStatus[int], 'task_status')], Coroutine[Any, Any, None]]"; expected "Callable[[NamedArg(TaskStatus[<nothing>], 'task_status')], Awaitable[Any]]"
+        await nursery.start(child, "hi")  # E: Argument 1 to "start" of "Nursery" has incompatible type "Callable[[int, NamedArg(TaskStatus[int], 'task_status')], Coroutine[Any, Any, None]]"; expected "Callable[[str, NamedArg(TaskStatus[int], 'task_status')], Awaitable[Any]]"
         result = await nursery.start(child, 10)
         result2 = await nursery.start(child2, 10)
         reveal_type(result)  # N: Revealed type is 'builtins.int*'
@@ -45,7 +45,7 @@ async def child2(
 
 async def parent() -> None:
     async with trio.open_nursery() as nursery:
-        nursery.start_soon(child, 10)  # E: Argument 1 to "start_soon" of "Nursery" has incompatible type "Callable[[int, NamedArg(TaskStatus[int], 'task_status')], Coroutine[Any, Any, None]]"; expected "Union[Callable[[], Awaitable[None]], Callable[[Any], Awaitable[None]], Callable[[Any, Any], Awaitable[None]], Callable[[Any, Any, Any], Awaitable[None]], Callable[[Any, Any, Any, Any], Awaitable[None]], Callable[[VarArg(Any)], Awaitable[None]]]"
+        nursery.start_soon(child, 10)  # E: Argument 1 to "start_soon" of "Nursery" has incompatible type "Callable[[int, NamedArg(TaskStatus[int], 'task_status')], Coroutine[Any, Any, None]]"; expected "Union[Callable[[], Awaitable[Any]], Callable[[Any], Awaitable[Any]], Callable[[Any, Any], Awaitable[Any]], Callable[[Any, Any, Any], Awaitable[Any]], Callable[[Any, Any, Any, Any], Awaitable[Any]], Callable[[VarArg(Any)], Awaitable[Any]]]"
         nursery.start_soon(child2)
         nursery.start_soon(child2, "hi")
         nursery.start_soon(child2, 50)

trio_typing/_tests/test-data/trio-basic.test

@@ -15,9 +15,9 @@ async def sleep_sort(values: Sequence[float]) -> List[float]:
         reveal_type(nursery.cancel_scope)  # N: Revealed type is 'trio.CancelScope'
         for value in values:
             nursery.start_soon(worker, value)
-            nursery.start_soon(worker)  # E: Argument 1 to "start_soon" of "Nursery" has incompatible type "Callable[[float], Coroutine[Any, Any, None]]"; expected "Callable[[], Awaitable[None]]"
-            nursery.start_soon(worker, "hi")  # E: Argument 1 to "start_soon" of "Nursery" has incompatible type "Callable[[float], Coroutine[Any, Any, None]]"; expected "Callable[[str], Awaitable[None]]"
-            nursery.start_soon(worker, value, value)  # E: Argument 1 to "start_soon" of "Nursery" has incompatible type "Callable[[float], Coroutine[Any, Any, None]]"; expected "Callable[[float, float], Awaitable[None]]"
+            nursery.start_soon(worker)  # E: Argument 1 to "start_soon" of "Nursery" has incompatible type "Callable[[float], Coroutine[Any, Any, None]]"; expected "Callable[[], Awaitable[Any]]"
+            nursery.start_soon(worker, "hi")  # E: Argument 1 to "start_soon" of "Nursery" has incompatible type "Callable[[float], Coroutine[Any, Any, None]]"; expected "Callable[[str], Awaitable[Any]]"
+            nursery.start_soon(worker, value, value)  # E: Argument 1 to "start_soon" of "Nursery" has incompatible type "Callable[[float], Coroutine[Any, Any, None]]"; expected "Callable[[float, float], Awaitable[Any]]"
 
     return result
 

trio_typing/plugin.py

@@ -410,7 +410,7 @@ def takes_callable_and_args_callback(ctx: FunctionContext) -> Type:
         @trio_typing.takes_callable_and_args
         def start_soon(
             self,
-            async_fn: Callable[[VarArg()], None],
+            async_fn: Callable[[VarArg()], Any],
             *args: Any,
         ) -> None: ...
 
@@ -424,20 +424,20 @@ def start_soon(
         @overload
         def start_soon(
             self,
-            async_fn: Callable[[], None],
+            async_fn: Callable[[], Any],
         ) -> None: ...
 
         @overload
         def start_soon(
             self,
-            async_fn: Callable[[T1], None],
+            async_fn: Callable[[T1], Any],
             __arg1: T1,
         ) -> None: ...
 
         @overload
         def start_soon(
             self,
-            async_fn: Callable[[T1, T2], None],
+            async_fn: Callable[[T1, T2], Any],
             __arg1: T1,
             __arg2: T2
         ) -> None: ...