3.8 compat fixes 2

Author: scarletcafe

jishaku/features/baseclass.py

@@ -49,7 +49,6 @@
 
 T = typing.TypeVar('T')
 P = ParamSpec('P')
-Task = asyncio.Task[typing.Any]
 GenericFeature = typing.TypeVar('GenericFeature', bound='Feature')
 
 
@@ -60,7 +59,7 @@ class CommandTask(typing.NamedTuple):
 
     index: int  # type: ignore
     ctx: ContextA
-    task: typing.Optional[Task]
+    task: typing.Optional['asyncio.Task[typing.Any]']
 
 
 class Feature(commands.Cog):

tests/test_executorfunc.py

@@ -33,14 +33,14 @@ def sig(*args, **kwargs):
     ]
 )
 @pytest.mark.asyncio
-async def test_magic_executor(args: tuple[typing.Any, ...], kwargs: dict[str, typing.Any], expected_return: tuple[int, int | None, int]):
-    def non_executor(a: int, b: int | None = None, *, c: int) -> tuple[int, int | None, int]:
+async def test_magic_executor(args: typing.Tuple[typing.Any, ...], kwargs: typing.Dict[str, typing.Any], expected_return: typing.Tuple[int, typing.Optional[int], int]):
+    def non_executor(a: int, b: typing.Optional[int] = None, *, c: int) -> typing.Tuple[int, typing.Optional[int], int]:
         return a, b, c
 
     exact_executor = executor_function(non_executor)
 
     @executor_function
-    def redefined_executor(a: int, b: int | None = None, *, c: int) -> tuple[int, int | None, int]:
+    def redefined_executor(a: int, b: typing.Optional[int] = None, *, c: int) -> typing.Tuple[int, typing.Optional[int], int]:
         return a, b, c
 
     assert inspect.signature(non_executor) == inspect.signature(exact_executor)

tests/test_repl.py

@@ -11,6 +11,7 @@
 
 import inspect
 import random
+import typing
 
 import pytest
 
@@ -66,7 +67,7 @@ def test_scope_var():
     ]
 )
 @pytest.mark.asyncio
-async def test_executor_basic(code: str, expected: list[int]):
+async def test_executor_basic(code: str, expected: typing.List[int]):
     return_data: list[int] = []
     async for result in AsyncCodeExecutor(code):
         return_data.append(result)
@@ -100,7 +101,7 @@ async def test_executor_basic(code: str, expected: list[int]):
     ]
 )
 @pytest.mark.asyncio
-async def test_executor_advanced(code: str, expected: list[int | None], arg_dict: dict[str, int] | None, scope: Scope):
+async def test_executor_advanced(code: str, expected: typing.List[typing.Optional[int]], arg_dict: typing.Optional[typing.Dict[str, int]], scope: Scope):
 
     return_data: list[int | None] = []
     async for result in AsyncCodeExecutor(code, scope, arg_dict=arg_dict):