Use typing_extensions only when needed

beets/util/__init__.py

@@ -45,7 +45,11 @@
     Union,
 )
 
-from typing_extensions import TypeAlias
+if sys.version_info >= (3, 10):
+    from typing import TypeAlias
+else:
+    from typing_extensions import TypeAlias
+
 from unidecode import unidecode
 
 from beets.util import hidden
@@ -157,7 +161,7 @@
     """Provide the canonical form of the path suitable for storing in
     the database.
     """
     path = syspath(path, prefix=False)
     path = os.path.normpath(os.path.abspath(os.path.expanduser(path)))
     return bytestring_path(path)
 
@@ -171,7 +175,7 @@
 
     The argument should *not* be the result of a call to `syspath`.
     """
     out = []
     last_path = None
     while path:
         path = os.path.dirname(path)
@@ -188,17 +192,17 @@
 
 def sorted_walk(
     path: AnyStr,
     ignore: Sequence = (),
     ignore_hidden: bool = False,
     logger: Optional[Logger] = None,
 ) -> Generator[Tuple, None, None]:
     """Like `os.walk`, but yields things in case-insensitive sorted,
     breadth-first order.  Directory and file names matching any glob
     pattern in `ignore` are skipped. If `logger` is provided, then
     warning messages are logged there when a directory cannot be listed.
     """
     # Make sure the paths aren't Unicode strings.
     path = bytestring_path(path)
     ignore = [bytestring_path(i) for i in ignore]
 
     # Get all the directories and files at this level.
@@ -223,7 +227,7 @@
             if fnmatch.fnmatch(base, pat):
                 if logger:
                     logger.debug(
                         "ignoring {} due to ignore rule {}".format(base, pat)
                     )
                 skip = True
                 break
@@ -231,7 +235,7 @@
             continue
 
         # Add to output as either a file or a directory.
         cur = os.path.join(path, base)
         if (ignore_hidden and not hidden.is_hidden(cur)) or not ignore_hidden:
             if os.path.isdir(syspath(cur)):
                 dirs.append(base)
@@ -245,7 +249,7 @@
 
     # Recurse into directories.
     for base in dirs:
         cur = os.path.join(path, base)
         # yield from sorted_walk(...)
         yield from sorted_walk(cur, ignore, ignore_hidden, logger)
 

beetsplug/aura.py

@@ -17,6 +17,7 @@
 
 import os
 import re
+import sys
 from dataclasses import dataclass
 from mimetypes import guess_type
 from typing import ClassVar, Mapping, Type
@@ -29,7 +30,11 @@
     request,
     send_file,
 )
-from typing_extensions import Self
+
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
 
 from beets import config
 from beets.dbcore.query import (

docs/changelog.rst

@@ -15,6 +15,7 @@ For packagers:
 
 * The minimum supported Python version is now 3.8.
 * The `beet` script has been removed from the repository.
+* The `typing_extensions` is required for Python 3.10 and below.
 
 Other changes:
 

pyproject.toml

@@ -41,7 +41,7 @@ mediafile = ">=0.12.0"
 munkres = ">=1.0.0"
 musicbrainzngs = ">=0.4"
 pyyaml = "*"
-typing_extensions = "*"
+typing_extensions = { version = "*", python = "<=3.10" }
 unidecode = ">=1.3.6"
 beautifulsoup4 = { version = "*", optional = true }
 dbus-python = { version = "*", optional = true }