Fix some remaining 3.8 compat issues

Author: scarletcafe

jishaku/features/baseclass.py

@@ -18,7 +18,7 @@
 from datetime import datetime, timezone
 
 from discord.ext import commands
-from typing_extensions import ParamSpec
+from typing_extensions import Concatenate, ParamSpec
 
 from jishaku.types import BotT, ContextA
 
@@ -49,7 +49,6 @@
 
 T = typing.TypeVar('T')
 P = ParamSpec('P')
-Concatenate = typing.Concatenate
 Task = asyncio.Task[typing.Any]
 GenericFeature = typing.TypeVar('GenericFeature', bound='Feature')
 

jishaku/features/root_command.py

@@ -13,7 +13,11 @@
 
 import sys
 import typing
-from importlib.metadata import distribution, packages_distributions
+
+try:
+    from importlib.metadata import distribution, packages_distributions
+except ImportError:
+    from importlib_metadata import distribution, packages_distributions
 
 import discord
 from discord.ext import commands

jishaku/shell.py

@@ -89,7 +89,7 @@ def __init__(
         self.stdout_task = self.make_reader_task(self.process.stdout, self.stdout_handler) if self.process.stdout else None
         self.stderr_task = self.make_reader_task(self.process.stderr, self.stderr_handler) if self.process.stderr else None
 
-        self.queue: asyncio.Queue[str] = asyncio.Queue(maxsize=250)
+        self.queue: 'asyncio.Queue[str]' = asyncio.Queue(maxsize=250)
 
     @property
     def closed(self) -> bool:

requirements/_.txt

@@ -4,3 +4,4 @@ discord.py >= 2.3.2
 import_expression >= 1.1.4, < 2.0.0
 tabulate >= 0.9.0
 typing-extensions >= 4.3, < 5
+importlib_metadata >= 3.7.0; python_version < "3.10"