Switch Ruff to ≥ Py3.9, apply changes

Directly import `zoneinfo` and `importlib.resources`
in the files where used

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/_helpers.py

@@ -2,6 +2,7 @@
 
 import datetime
 import math
+import zoneinfo
 
 from typing import NamedTuple
 from typing import cast
@@ -22,7 +23,6 @@
 from pendulum.constants import TM_DECEMBER
 from pendulum.constants import TM_JANUARY
 from pendulum.tz.timezone import Timezone
-from pendulum.utils._compat import zoneinfo
 
 
 class PreciseDiff(NamedTuple):

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/locales/locale.py

@@ -2,15 +2,13 @@
 
 import re
 
-from importlib import import_module
+from importlib import import_module, resources
 from pathlib import Path
 from typing import Any
 from typing import ClassVar
 from typing import Dict
 from typing import cast
 
-from pendulum.utils._compat import resources
-
 
 class Locale:
     """

src/pendulum/tz/__init__.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from importlib import resources
 from pathlib import Path
 from typing import cast
 
@@ -9,7 +10,6 @@
 from pendulum.tz.timezone import UTC
 from pendulum.tz.timezone import FixedTimezone
 from pendulum.tz.timezone import Timezone
-from pendulum.utils._compat import resources
 
 
 PRE_TRANSITION = "pre"

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/tz/timezone.py

@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 import datetime as _datetime
+import zoneinfo
 
 from abc import ABC
 from abc import abstractmethod
@@ -12,7 +13,6 @@
 from pendulum.tz.exceptions import AmbiguousTime
 from pendulum.tz.exceptions import InvalidTimezone
 from pendulum.tz.exceptions import NonExistingTime
-from pendulum.utils._compat import zoneinfo
 
 
 if TYPE_CHECKING:

src/pendulum/utils/_compat.py

@@ -2,14 +2,5 @@
 
 import sys
 
-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"]