Skip to content

Commit 40737de

Browse files
committed
style: remove Python 3.9 compatible code
1 parent 11d24bb commit 40737de

File tree

8 files changed

+14
-44
lines changed

8 files changed

+14
-44
lines changed

commitizen/changelog_formats/__init__.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
from __future__ import annotations
22

3-
import sys
4-
from typing import Callable, ClassVar, Protocol
5-
6-
if sys.version_info >= (3, 10):
7-
from importlib import metadata
8-
else:
9-
import importlib_metadata as metadata
3+
from collections.abc import Callable
4+
from importlib import metadata
5+
from typing import ClassVar, Protocol
106

117
from commitizen.changelog import Metadata
128
from commitizen.config.base_config import BaseConfig

commitizen/cz/__init__.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,9 @@
22

33
import importlib
44
import pkgutil
5-
import sys
65
import warnings
76
from collections.abc import Iterable
8-
9-
if sys.version_info >= (3, 10):
10-
from importlib import metadata
11-
else:
12-
import importlib_metadata as metadata
7+
from importlib import metadata
138

149
from commitizen.cz.base import BaseCommitizen
1510

commitizen/cz/base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from __future__ import annotations
22

33
from abc import ABCMeta, abstractmethod
4-
from collections.abc import Iterable, Mapping
5-
from typing import Any, Callable, Protocol
4+
from collections.abc import Callable, Iterable, Mapping
5+
from typing import Any, Protocol
66

77
from jinja2 import BaseLoader, PackageLoader
88
from prompt_toolkit.styles import Style

commitizen/providers/__init__.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
from __future__ import annotations
22

3-
import sys
3+
from importlib import metadata
44
from typing import cast
55

6-
if sys.version_info >= (3, 10):
7-
from importlib import metadata
8-
else:
9-
import importlib_metadata as metadata
10-
116
from commitizen.config.base_config import BaseConfig
127
from commitizen.exceptions import VersionProviderUnknown
138
from commitizen.providers.base_provider import VersionProvider

commitizen/question.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
from typing import Callable, Literal, TypedDict, Union
1+
from collections.abc import Callable
2+
from typing import Literal, TypedDict
23

34

45
class Choice(TypedDict, total=False):
@@ -29,4 +30,4 @@ class ConfirmQuestion(TypedDict):
2930
default: bool
3031

3132

32-
CzQuestion = Union[ListQuestion, InputQuestion, ConfirmQuestion]
33+
CzQuestion = ListQuestion | InputQuestion | ConfirmQuestion

commitizen/version_schemes.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import re
44
import sys
55
import warnings
6+
from importlib import metadata
67
from itertools import zip_longest
78
from typing import (
89
TYPE_CHECKING,
@@ -14,23 +15,14 @@
1415
runtime_checkable,
1516
)
1617

17-
if sys.version_info >= (3, 10):
18-
from importlib import metadata
19-
else:
20-
import importlib_metadata as metadata
21-
2218
from packaging.version import InvalidVersion # noqa: F401 (expose the common exception)
2319
from packaging.version import Version as _BaseVersion
2420

2521
from commitizen.defaults import MAJOR, MINOR, PATCH, Settings
2622
from commitizen.exceptions import VersionSchemeUnknown
2723

2824
if TYPE_CHECKING:
29-
# TypeAlias is Python 3.10+ but backported in typing-extensions
30-
if sys.version_info >= (3, 10):
31-
from typing import TypeAlias
32-
else:
33-
from typing_extensions import TypeAlias
25+
from typing import TypeAlias
3426

3527
# Self is Python 3.11+ but backported in typing-extensions
3628
if sys.version_info < (3, 11):

tests/test_factory.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import sys
2+
from importlib import metadata
23
from textwrap import dedent
34

4-
if sys.version_info >= (3, 10):
5-
from importlib import metadata
6-
else:
7-
import importlib_metadata as metadata
8-
95
import pytest
106

117
from commitizen import BaseCommitizen, defaults, factory

tests/test_version_schemes.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
from __future__ import annotations
22

3-
import sys
4-
5-
if sys.version_info >= (3, 10):
6-
from importlib import metadata
7-
else:
8-
import importlib_metadata as metadata
3+
from importlib import metadata
94

105
import pytest
116
from pytest_mock import MockerFixture

0 commit comments

Comments
 (0)