Switch Ruff to > Py3.9, apply changes

Author: M5oul

pyproject.toml

@@ -91,7 +91,7 @@ fix = true
 unfixable = [
     "ERA", # do not autoremove commented out code
 ]
-target-version = "py38"
+target-version = "py39"
 line-length = 88
 extend-select = [
     "B", # flake8-bugbear

src/pendulum/formatting/formatter.py

@@ -3,12 +3,12 @@
 import datetime
 import re
 
+from collections.abc import Sequence
+from re import Match
 from typing import TYPE_CHECKING
 from typing import Any
 from typing import Callable
 from typing import ClassVar
-from typing import Match
-from typing import Sequence
 from typing import cast
 
 import pendulum

src/pendulum/interval.py

@@ -7,7 +7,6 @@
 from datetime import timedelta
 from typing import TYPE_CHECKING
 from typing import Generic
-from typing import Iterator
 from typing import TypeVar
 from typing import cast
 from typing import overload
@@ -20,6 +19,8 @@
 
 
 if TYPE_CHECKING:
+    from collections.abc import Iterator
+
     from typing_extensions import Self
     from typing_extensions import SupportsIndex
 

src/pendulum/tz/local_timezone.py

@@ -7,7 +7,7 @@
 import warnings
 
 from contextlib import contextmanager
-from typing import Iterator
+from typing import TYPE_CHECKING
 from typing import cast
 
 from pendulum.tz.exceptions import InvalidTimezone
@@ -16,6 +16,10 @@
 from pendulum.tz.timezone import Timezone
 
 
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+
+
 if sys.platform == "win32":
     import winreg
 

src/pendulum/utils/_compat.py

@@ -2,14 +2,12 @@
 
 import sys
 
+from importlib import resources
+
 from pendulum.utils import _zoneinfo as zoneinfo
 
 
 PYPY = hasattr(sys, "pypy_version_info")
 
-if sys.version_info < (3, 9):
-    import importlib_resources as resources
-else:
-    from importlib import resources
 
 __all__ = ["resources", "zoneinfo"]

src/pendulum/utils/_zoneinfo.py

@@ -1,74 +1,12 @@
 from __future__ import annotations
 
-import sys
+from zoneinfo import TZPATH
+from zoneinfo import InvalidTZPathWarning
+from zoneinfo import ZoneInfo
+from zoneinfo import ZoneInfoNotFoundError
+from zoneinfo import available_timezones
+from zoneinfo import reset_tzpath
 
-from typing import TYPE_CHECKING
-
-
-if sys.version_info < (3, 9):
-    # Works around https://github.com/pganssle/zoneinfo/issues/125
-    from backports.zoneinfo import TZPATH
-    from backports.zoneinfo import InvalidTZPathWarning
-    from backports.zoneinfo import ZoneInfoNotFoundError
-    from backports.zoneinfo import available_timezones
-    from backports.zoneinfo import reset_tzpath
-
-    if TYPE_CHECKING:
-        from collections.abc import Iterable
-        from datetime import datetime
-        from datetime import timedelta
-        from datetime import tzinfo
-        from typing import Any
-        from typing import Protocol
-
-        from typing_extensions import Self
-
-        class _IOBytes(Protocol):
-            def read(self, __size: int) -> bytes:
-                ...
-
-            def seek(self, __size: int, __whence: int = ...) -> Any:
-                ...
-
-        class ZoneInfo(tzinfo):
-            @property
-            def key(self) -> str:
-                ...
-
-            def __init__(self, key: str) -> None:
-                ...
-
-            @classmethod
-            def no_cache(cls, key: str) -> Self:
-                ...
-
-            @classmethod
-            def from_file(cls, __fobj: _IOBytes, key: str | None = ...) -> Self:
-                ...
-
-            @classmethod
-            def clear_cache(cls, *, only_keys: Iterable[str] | None = ...) -> None:
-                ...
-
-            def tzname(self, __dt: datetime | None) -> str | None:
-                ...
-
-            def utcoffset(self, __dt: datetime | None) -> timedelta | None:
-                ...
-
-            def dst(self, __dt: datetime | None) -> timedelta | None:
-                ...
-
-    else:
-        from backports.zoneinfo import ZoneInfo
-
-else:
-    from zoneinfo import TZPATH
-    from zoneinfo import InvalidTZPathWarning
-    from zoneinfo import ZoneInfo
-    from zoneinfo import ZoneInfoNotFoundError
-    from zoneinfo import available_timezones
-    from zoneinfo import reset_tzpath
 
 __all__ = [
     "ZoneInfo",

tests/testing/test_time_travel.py

@@ -11,7 +11,7 @@
 
 
 if TYPE_CHECKING:
-    from typing import Generator
+    from collections.abc import Generator
 
 
 @pytest.fixture(autouse=True)