Update code unlocked by Python 3.10 minimum version

Author: nhairs

pyproject.toml

@@ -16,9 +16,6 @@ maintainers  = [
 
 # Dependency Information
 requires-python = ">=3.10"
-dependencies = [
-    "typing_extensions;python_version<'3.10'",
-]
 
 # Extra information
 readme = "README.md"
@@ -55,7 +52,6 @@ dev = [
     ## Test
     "pytest",
     "freezegun",
-    "backports.zoneinfo;python_version<'3.9'",
     "tzdata",
     ## Build
     "build",

src/pythonjsonlogger/core.py

@@ -10,12 +10,8 @@
 import logging
 import re
 import sys
-from typing import Optional, Union, List, Dict, Container, Any, Sequence
-
-if sys.version_info >= (3, 10):
-    from typing import TypeAlias
-else:
-    from typing_extensions import TypeAlias
+from typing import TypeAlias, Any
+from collections.abc import Container, Sequence
 
 ## Installed
 
@@ -24,7 +20,7 @@
 
 ### CONSTANTS
 ### ============================================================================
-RESERVED_ATTRS: List[str] = [
+RESERVED_ATTRS: list[str] = [
     "args",
     "asctime",
     "created",
@@ -71,7 +67,7 @@
 
 ## Type Aliases
 ## -----------------------------------------------------------------------------
-LogData: TypeAlias = Dict[str, Any]
+LogData: TypeAlias = dict[str, Any]
 """Type alias
 
 *Changed in 4.0*: renamed from `LogRecord` to `LogData`
@@ -82,10 +78,10 @@
 ### ============================================================================
 def merge_record_extra(
     record: logging.LogRecord,
-    target: Dict,
+    target: dict[Any, Any],
     reserved: Container[str],
-    rename_fields: Optional[Dict[str, str]] = None,
-) -> Dict:
+    rename_fields: dict[str, str] | None = None,
+) -> dict[Any, Any]:
     """
     Merges extra attributes from LogRecord object into target dictionary
 
@@ -121,25 +117,25 @@ class BaseJsonFormatter(logging.Formatter):
     *Added in 3.3*: `exc_info_as_array` and `stack_info_as_array` options are added.
     """
 
-    _style: Union[logging.PercentStyle, str]  # type: ignore[assignment]
+    _style: logging.PercentStyle | str  # type: ignore[assignment]
 
     ## Parent Methods
     ## -------------------------------------------------------------------------
     # pylint: disable=too-many-arguments,super-init-not-called
     def __init__(
         self,
-        fmt: Optional[Union[str, Sequence[str]]] = None,
-        datefmt: Optional[str] = None,
+        fmt: str | Sequence[str] | None = None,
+        datefmt: str | None = None,
         style: str = "%",
         validate: bool = True,
         *,
         prefix: str = "",
-        rename_fields: Optional[Dict[str, str]] = None,
+        rename_fields: dict[str, str] | None = None,
         rename_fields_keep_missing: bool = False,
-        static_fields: Optional[Dict[str, Any]] = None,
-        reserved_attrs: Optional[Sequence[str]] = None,
-        timestamp: Union[bool, str] = False,
-        defaults: Optional[Dict[str, Any]] = None,
+        static_fields: dict[str, Any] | None = None,
+        reserved_attrs: Sequence[str] | None = None,
+        timestamp: bool | str = False,
+        defaults: dict[str, Any] | None = None,
         exc_info_as_array: bool = False,
         stack_info_as_array: bool = False,
     ) -> None:
@@ -243,7 +239,7 @@ def format(self, record: logging.LogRecord) -> str:
         Args:
             record: the record to format
         """
-        message_dict: Dict[str, Any] = {}
+        message_dict: dict[str, Any] = {}
         # TODO: logging.LogRecord.msg and logging.LogRecord.message in typeshed
         #        are always type of str. We shouldn't need to override that.
         if isinstance(record.msg, dict):
@@ -276,7 +272,7 @@ def format(self, record: logging.LogRecord) -> str:
 
     ## JSON Formatter Specific Methods
     ## -------------------------------------------------------------------------
-    def parse(self) -> List[str]:
+    def parse(self) -> list[str]:
         """Parses format string looking for substitutions
 
         This method is responsible for returning a list of fields (as strings)
@@ -327,9 +323,9 @@ def serialize_log_record(self, log_data: LogData) -> str:
 
     def add_fields(
         self,
-        log_data: Dict[str, Any],
+        log_data: dict[str, Any],
         record: logging.LogRecord,
-        message_dict: Dict[str, Any],
+        message_dict: dict[str, Any],
     ) -> None:
         """Extract fields from a LogRecord for logging
 
@@ -402,15 +398,15 @@ def process_log_record(self, log_data: LogData) -> LogData:
         """
         return log_data
 
-    def formatException(self, ei) -> Union[str, list[str]]:  # type: ignore
+    def formatException(self, ei) -> str | list[str]:  # type: ignore[override]
         """Format and return the specified exception information.
 
         If exc_info_as_array is set to True, This method returns an array of strings.
         """
         exception_info_str = super().formatException(ei)
         return exception_info_str.splitlines() if self.exc_info_as_array else exception_info_str
 
-    def formatStack(self, stack_info) -> Union[str, list[str]]:  # type: ignore
+    def formatStack(self, stack_info) -> str | list[str]:  # type: ignore[override]
         """Format and return the specified stack information.
 
         If stack_info_as_array is set to True, This method returns an array of strings.

src/pythonjsonlogger/defaults.py

@@ -16,17 +16,11 @@
 import dataclasses
 import datetime
 import enum
-import sys
 from types import TracebackType
-from typing import Any
+from typing import Any, TypeGuard
 import traceback
 import uuid
 
-if sys.version_info >= (3, 10):
-    from typing import TypeGuard
-else:
-    from typing_extensions import TypeGuard
-
 ## Installed
 
 ## Application

src/pythonjsonlogger/json.py

@@ -12,7 +12,8 @@
 ## Standard Library
 import datetime
 import json
-from typing import Any, Callable, Optional, Union
+from typing import Any
+from collections.abc import Callable
 import warnings
 
 ## Application
@@ -67,10 +68,10 @@ class JsonFormatter(core.BaseJsonFormatter):
     def __init__(
         self,
         *args,
-        json_default: Optional[Callable] = None,
-        json_encoder: Optional[Callable] = None,
+        json_default: Callable | None = None,
+        json_encoder: Callable | None = None,
         json_serializer: Callable = json.dumps,
-        json_indent: Optional[Union[int, str]] = None,
+        json_indent: int | str | None = None,
         json_ensure_ascii: bool = True,
         **kwargs,
     ) -> None:

src/pythonjsonlogger/msgspec.py

@@ -6,7 +6,8 @@
 from __future__ import annotations
 
 ## Standard Library
-from typing import Any, Optional, Callable
+from typing import Any
+from collections.abc import Callable
 
 ## Installed
 
@@ -43,7 +44,7 @@ class MsgspecFormatter(core.BaseJsonFormatter):
     def __init__(
         self,
         *args,
-        json_default: Optional[Callable] = msgspec_default,
+        json_default: Callable | None = msgspec_default,
         **kwargs,
     ) -> None:
         """

src/pythonjsonlogger/orjson.py

@@ -6,7 +6,8 @@
 from __future__ import annotations
 
 ## Standard Library
-from typing import Any, Optional, Callable
+from typing import Any
+from collections.abc import Callable
 
 ## Installed
 
@@ -45,7 +46,7 @@ class OrjsonFormatter(core.BaseJsonFormatter):
     def __init__(
         self,
         *args,
-        json_default: Optional[Callable] = orjson_default,
+        json_default: Callable | None = orjson_default,
         json_indent: bool = False,
         **kwargs,
     ) -> None:

tests/test_dictconfig.py

@@ -9,7 +9,8 @@
 import json
 import logging
 import logging.config
-from typing import Any, Generator
+from typing import Any
+from collections.abc import Generator
 
 ## Installed
 import pytest
@@ -64,7 +65,7 @@ def load_json(self) -> Any:
 
 
 @pytest.fixture
-def env() -> Generator[LoggingEnvironment, None, None]:
+def env() -> Generator[LoggingEnvironment]:
     global _LOGGER_COUNT  # pylint: disable=global-statement
     _LOGGER_COUNT += 1
     logging.config.dictConfig(LOGGING_CONFIG)

tests/test_formatters.py

@@ -13,13 +13,10 @@
 import sys
 import traceback
 from types import TracebackType
-from typing import Any, Generator
+from typing import Any
+from collections.abc import Generator
 import uuid
-
-if sys.version_info >= (3, 9):
-    import zoneinfo
-else:
-    from backports import zoneinfo
+import zoneinfo
 
 ## Installed
 import freezegun
@@ -63,7 +60,7 @@ def load_json(self) -> Any:
 
 
 @pytest.fixture
-def env() -> Generator[LoggingEnvironment, None, None]:
+def env() -> Generator[LoggingEnvironment]:
     global _LOGGER_COUNT  # pylint: disable=global-statement
     _LOGGER_COUNT += 1
     logger = logging.getLogger(f"pythonjsonlogger.tests.{_LOGGER_COUNT}")