style: remove Python 3.9 compatible code

Author: Lee-W

commitizen/changelog_formats/__init__.py

@@ -1,16 +1,13 @@
 from __future__ import annotations
 
-import sys
-from typing import TYPE_CHECKING, Callable, ClassVar, Protocol
-
-if sys.version_info >= (3, 10):
-    from importlib import metadata
-else:
-    import importlib_metadata as metadata
+from importlib import metadata
+from typing import TYPE_CHECKING, ClassVar, Protocol
 
 from commitizen.exceptions import ChangelogFormatUnknown
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
+
     from commitizen.changelog import Metadata
     from commitizen.config.base_config import BaseConfig
 

commitizen/cz/__init__.py

@@ -2,14 +2,9 @@
 
 import importlib
 import pkgutil
-import sys
 import warnings
-
-if sys.version_info >= (3, 10):
-    from importlib import metadata
-else:
-    import importlib_metadata as metadata
-
+from collections.abc import Iterable
+from importlib import metadata
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:

commitizen/cz/base.py

@@ -2,7 +2,7 @@
 
 from abc import ABCMeta, abstractmethod
 from collections.abc import Iterable, Mapping
-from typing import TYPE_CHECKING, Any, Callable, NamedTuple, Protocol
+from typing import TYPE_CHECKING, Any, NamedTuple, Protocol
 
 from jinja2 import BaseLoader, PackageLoader
 from prompt_toolkit.styles import Style
@@ -11,7 +11,7 @@
 
 if TYPE_CHECKING:
     import re
-    from collections.abc import Iterable, Mapping
+    from collections.abc import Callable, Iterable, Mapping
 
     from commitizen import git
     from commitizen.config.base_config import BaseConfig

commitizen/providers/__init__.py

@@ -1,13 +1,9 @@
 from __future__ import annotations
 
-import sys
+from importlib import metadata
 from typing import TYPE_CHECKING, cast
 
-if sys.version_info >= (3, 10):
-    from importlib import metadata
-else:
-    import importlib_metadata as metadata
-
+from commitizen.config.base_config import BaseConfig
 from commitizen.exceptions import VersionProviderUnknown
 from commitizen.providers.cargo_provider import CargoProvider
 from commitizen.providers.commitizen_provider import CommitizenProvider

commitizen/question.py

@@ -1,4 +1,5 @@
-from typing import Callable, Literal, TypedDict, Union
+from collections.abc import Callable
+from typing import Literal, TypedDict
 
 
 class Choice(TypedDict, total=False):
@@ -29,4 +30,4 @@ class ConfirmQuestion(TypedDict):
     default: bool
 
 
-CzQuestion = Union[ListQuestion, InputQuestion, ConfirmQuestion]
+CzQuestion = ListQuestion | InputQuestion | ConfirmQuestion

commitizen/version_schemes.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import re
-import sys
 import warnings
+from importlib import metadata
 from itertools import zip_longest
 from typing import (
     TYPE_CHECKING,
@@ -14,23 +14,15 @@
     runtime_checkable,
 )
 
-if sys.version_info >= (3, 10):
-    from importlib import metadata
-else:
-    import importlib_metadata as metadata
-
 from packaging.version import InvalidVersion  # noqa: F401 (expose the common exception)
 from packaging.version import Version as _BaseVersion
 
 from commitizen.defaults import MAJOR, MINOR, PATCH, Settings
 from commitizen.exceptions import VersionSchemeUnknown
 
 if TYPE_CHECKING:
-    # TypeAlias is Python 3.10+ but backported in typing-extensions
-    if sys.version_info >= (3, 10):
-        from typing import TypeAlias
-    else:
-        from typing_extensions import TypeAlias
+    import sys
+    from typing import TypeAlias
 
     # Self is Python 3.11+ but backported in typing-extensions
     if sys.version_info < (3, 11):

tests/test_factory.py

@@ -1,11 +1,7 @@
 import sys
+from importlib import metadata
 from textwrap import dedent
 
-if sys.version_info >= (3, 10):
-    from importlib import metadata
-else:
-    import importlib_metadata as metadata
-
 import pytest
 
 from commitizen import BaseCommitizen, defaults, factory

tests/test_version_schemes.py

@@ -1,12 +1,6 @@
 from __future__ import annotations
 
-import sys
-
-if sys.version_info >= (3, 10):
-    from importlib import metadata
-else:
-    import importlib_metadata as metadata
-
+from importlib import metadata
 from typing import TYPE_CHECKING
 
 import pytest