Fix tests on py 3.12

Also remove support for generators in app.create_task
Bibo-Joshi · Jul 5, 2023 · Jun 2, 2023 · Jun 3, 2023 · Jun 3, 2023 · Jun 4, 2023
commit 1a3e4f74d68400ea429abefeac680b49ee891b10
diff --git a/telegram/ext/_application.py b/telegram/ext/_application.py
@@ -36,7 +36,6 @@
     Coroutine,
     DefaultDict,
     Dict,
-    Generator,
     Generic,
     List,
     Mapping,
@@ -938,7 +937,7 @@ def __run(
 
     def create_task(
         self,
-        coroutine: Union[Generator[Optional["asyncio.Future[object]"], None, RT], Awaitable[RT]],
+        coroutine: Union[Optional["asyncio.Future[object]"], Awaitable[RT]],
         update: Optional[object] = None,
     ) -> "asyncio.Task[RT]":
         """Thin wrapper around :func:`asyncio.create_task` that handles exceptions raised by
@@ -957,6 +956,8 @@ def create_task(
 
                 .. versionchanged:: 20.2
                     Accepts :class:`asyncio.Future` and generator-based coroutine functions.
+                .. versionchanged:: NEXT.VERSION
+                    Since Python 3.12, generator-based coroutine functions are no longer accepted.
             update (:obj:`object`, optional): If set, will be passed to :meth:`process_error`
                 as additional information for the error handlers. Moreover, the corresponding
                 :attr:`chat_data` and :attr:`user_data` entries will be updated in the next run of
@@ -969,7 +970,7 @@ def create_task(
 
     def __create_task(
         self,
-        coroutine: Union[Generator[Optional["asyncio.Future[object]"], None, RT], Awaitable[RT]],
+        coroutine: Union[Optional["asyncio.Future[object]"], Awaitable[RT]],
         update: Optional[object] = None,
         is_error_handler: bool = False,
     ) -> "asyncio.Task[RT]":
@@ -1004,14 +1005,12 @@ def __create_task_done_callback(self, task: asyncio.Task) -> None:
 
     async def __create_task_callback(
         self,
-        coroutine: Union[Generator[Optional["asyncio.Future[object]"], None, RT], Awaitable[RT]],
+        coroutine: Union[Optional["asyncio.Future[object]"], Awaitable[RT]],
         update: Optional[object] = None,
         is_error_handler: bool = False,
     ) -> RT:
         try:
-            if isinstance(coroutine, Generator):
-                return await asyncio.create_task(coroutine)
-            return await coroutine
+            return await coroutine  # type: ignore[misc]
         except asyncio.CancelledError as cancel:
             # TODO: in py3.8+, CancelledError is a subclass of BaseException, so we can drop this
             #  clause when we drop py3.7
@@ -1619,9 +1618,7 @@ async def process_error(
         update: Optional[object],
         error: Exception,
         job: Optional["Job[CCT]"] = None,
-        coroutine: Optional[
-            Union[Generator[Optional["asyncio.Future[object]"], None, RT], Awaitable[RT]]
-        ] = None,
+        coroutine: Optional[Union[Optional["asyncio.Future[object]"], Awaitable[RT]]] = None,
     ) -> bool:
         """Processes an error by passing it to all error handlers registered with
         :meth:`add_error_handler`. If one of the error handlers raises

diff --git a/tests/ext/test_application.py b/tests/ext/test_application.py
@@ -1299,16 +1299,6 @@ async def callback():
         out = await app.create_task(asyncio.gather(callback()))
         assert out == [42]
 
-    async def test_create_task_awaiting_generator(self, app):
-        event = asyncio.Event()
-
-        def gen():
-            yield
-            event.set()
-
-        await app.create_task(gen())
-        assert event.is_set()
-
     async def test_no_concurrent_updates(self, app):
         queue = asyncio.Queue()
         event_1 = asyncio.Event()

diff --git a/tests/ext/test_basepersistence.py b/tests/ext/test_basepersistence.py
@@ -22,6 +22,7 @@
 import enum
 import functools
 import logging
+import sys
 import time
 from pathlib import Path
 from typing import NamedTuple, Optional
@@ -377,15 +378,13 @@ def test_init_store_data_update_interval(self, bot_data, chat_data, user_data, c
         assert persistence.store_data.callback_data == callback_data
 
     def test_abstract_methods(self):
+        methods = list(BasePersistence.__abstractmethods__)
+        methods.sort()
         with pytest.raises(
             TypeError,
-            match=(
-                "drop_chat_data, drop_user_data, flush, get_bot_data, get_callback_data, "
-                "get_chat_data, get_conversations, "
-                "get_user_data, refresh_bot_data, refresh_chat_data, "
-                "refresh_user_data, update_bot_data, update_callback_data, "
-                "update_chat_data, update_conversation, update_user_data"
-            ),
+            match=", ".join(methods)
+            if sys.version_info < (3, 12)
+            else ", ".join(f"'{i}'" for i in methods),
         ):
             BasePersistence()
 

diff --git a/tests/ext/test_picklepersistence.py b/tests/ext/test_picklepersistence.py
@@ -20,6 +20,7 @@
 import gzip
 import os
 import pickle
+import sys
 from pathlib import Path
 
 import pytest
@@ -872,7 +873,8 @@ async def test_custom_pickler_unpickler_simple(
             "function was specified."
         )
         with Path("pickletest_chat_data").open("rb") as f, pytest.raises(
-            pickle.UnpicklingError, match=err_msg
+            pickle.UnpicklingError,
+            match=err_msg if sys.version_info < (3, 12) else err_msg.replace("\n", " "),
         ):
             pickle.load(f)