make type annotations compatible with older Python versions

Author: rnovatorov

enapter/async_/generator.py

@@ -8,7 +8,7 @@ def generator(
 ) -> Callable[..., AsyncContextManager[AsyncGenerator]]:
     @functools.wraps(func)
     @contextlib.asynccontextmanager
-    async def wrapper(*args, **kwargs) -> AsyncGenerator[AsyncGenerator]:
+    async def wrapper(*args, **kwargs) -> AsyncGenerator[AsyncGenerator, None]:
         gen = func(*args, **kwargs)
         try:
             yield gen

enapter/mqtt/api/device_channel.py

@@ -35,7 +35,9 @@ def _new_logger(hardware_id, channel_id) -> logging.LoggerAdapter:
         return logging.LoggerAdapter(LOGGER, extra=extra)
 
     @enapter.async_.generator
-    async def subscribe_to_command_requests(self) -> AsyncGenerator[CommandRequest]:
+    async def subscribe_to_command_requests(
+        self,
+    ) -> AsyncGenerator[CommandRequest, None]:
         async with self._subscribe("v1/command/requests") as messages:
             async for msg in messages:
                 assert isinstance(msg.payload, str) or isinstance(msg.payload, bytes)
@@ -62,7 +64,7 @@ async def publish_logs(
 
     def _subscribe(
         self, path: str
-    ) -> AsyncContextManager[AsyncGenerator[aiomqtt.Message]]:
+    ) -> AsyncContextManager[AsyncGenerator[aiomqtt.Message, None]]:
         topic = f"v1/to/{self._hardware_id}/{self._channel_id}/{path}"
         return self._client.subscribe(topic)
 

enapter/mqtt/client.py

@@ -38,7 +38,7 @@ async def publish(self, *args, **kwargs) -> None:
         await self._publisher.publish(*args, **kwargs)
 
     @enapter.async_.generator
-    async def subscribe(self, *topics: str) -> AsyncGenerator[aiomqtt.Message]:
+    async def subscribe(self, *topics: str) -> AsyncGenerator[aiomqtt.Message, None]:
         while True:
             try:
                 async with self._connect() as subscriber:
@@ -75,7 +75,7 @@ async def _run(self) -> None:
                 self._logger.info("publisher disconnected")
 
     @contextlib.asynccontextmanager
-    async def _connect(self) -> AsyncGenerator[aiomqtt.Client]:
+    async def _connect(self) -> AsyncGenerator[aiomqtt.Client, None]:
         host = await self._maybe_resolve_mdns(self._config.host)
         async with aiomqtt.Client(
             hostname=host,