python-json-logger 4.0.0rc1__tar.gz → 4.1.0__tar.gz

{python_json_logger-4.0.0rc1/src/python_json_logger.egg-info → python_json_logger-4.1.0}/PKG-INFO

@@ -1,30 +1,26 @@
 Metadata-Version: 2.4
 Name: python-json-logger
-Version: 4.0.0rc1
+Version: 4.1.0
 Summary: JSON Log Formatter for the Python Logging Package
 Author-email: Zakaria Zajac <zak@madzak.com>, Nicholas Hairs <info+python-json-logger@nicholashairs.com>
 Maintainer-email: Nicholas Hairs <info+python-json-logger@nicholashairs.com>
-License: BSD-2-Clause License
+License-Expression: BSD-2-Clause
 Project-URL: Homepage, https://nhairs.github.io/python-json-logger
 Project-URL: GitHub, https://github.com/nhairs/python-json-logger
 Classifier: Development Status :: 6 - Mature
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: System :: Logging
 Classifier: Typing :: Typed
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-License-File: NOTICE
-Requires-Dist: typing_extensions; python_version < "3.10"
 Provides-Extra: dev
 Requires-Dist: orjson; implementation_name != "pypy" and extra == "dev"
 Requires-Dist: msgspec; implementation_name != "pypy" and extra == "dev"
@@ -34,7 +30,6 @@ Requires-Dist: pylint; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: freezegun; extra == "dev"
-Requires-Dist: backports.zoneinfo; python_version < "3.9" and extra == "dev"
 Requires-Dist: tzdata; extra == "dev"
 Requires-Dist: build; extra == "dev"
 Requires-Dist: mkdocs; extra == "dev"

{python_json_logger-4.0.0rc1 → python_json_logger-4.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-json-logger"
-version = "4.0.0.rc1"
+version = "4.1.0"
 description = "JSON Log Formatter for the Python Logging Package"
 authors = [
     {name = "Zakaria Zajac", email = "zak@madzak.com"},
@@ -15,26 +15,22 @@ maintainers  = [
 ]
 
 # Dependency Information
-requires-python = ">=3.8"
-dependencies = [
-    "typing_extensions;python_version<'3.10'",
-]
+requires-python = ">=3.10"
 
 # Extra information
 readme = "README.md"
-license = {text = "BSD-2-Clause License"}
+license = "BSD-2-Clause"
+license-files = ["LICENSE"]
 classifiers = [
     "Development Status :: 6 - Mature",
     "Intended Audience :: Developers",
-    "License :: OSI Approved :: BSD License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: System :: Logging",
     "Typing :: Typed",
 ]
@@ -56,7 +52,6 @@ dev = [
     ## Test
     "pytest",
     "freezegun",
-    "backports.zoneinfo;python_version<'3.9'",
     "tzdata",
     ## Build
     "build",

{python_json_logger-4.0.0rc1 → python_json_logger-4.1.0/src/python_json_logger.egg-info}/PKG-INFO

@@ -1,30 +1,26 @@
 Metadata-Version: 2.4
 Name: python-json-logger
-Version: 4.0.0rc1
+Version: 4.1.0
 Summary: JSON Log Formatter for the Python Logging Package
 Author-email: Zakaria Zajac <zak@madzak.com>, Nicholas Hairs <info+python-json-logger@nicholashairs.com>
 Maintainer-email: Nicholas Hairs <info+python-json-logger@nicholashairs.com>
-License: BSD-2-Clause License
+License-Expression: BSD-2-Clause
 Project-URL: Homepage, https://nhairs.github.io/python-json-logger
 Project-URL: GitHub, https://github.com/nhairs/python-json-logger
 Classifier: Development Status :: 6 - Mature
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: System :: Logging
 Classifier: Typing :: Typed
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-License-File: NOTICE
-Requires-Dist: typing_extensions; python_version < "3.10"
 Provides-Extra: dev
 Requires-Dist: orjson; implementation_name != "pypy" and extra == "dev"
 Requires-Dist: msgspec; implementation_name != "pypy" and extra == "dev"
@@ -34,7 +30,6 @@ Requires-Dist: pylint; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: freezegun; extra == "dev"
-Requires-Dist: backports.zoneinfo; python_version < "3.9" and extra == "dev"
 Requires-Dist: tzdata; extra == "dev"
 Requires-Dist: build; extra == "dev"
 Requires-Dist: mkdocs; extra == "dev"

{python_json_logger-4.0.0rc1 → python_json_logger-4.1.0}/src/python_json_logger.egg-info/requires.txt

@@ -1,7 +1,4 @@
 
-[:python_version < "3.10"]
-typing_extensions
-
 [dev]
 validate-pyproject[all]
 black
@@ -23,6 +20,3 @@ mike
 [dev:implementation_name != "pypy"]
 orjson
 msgspec
-
-[dev:python_version < "3.9"]
-backports.zoneinfo

{python_json_logger-4.0.0rc1 → python_json_logger-4.1.0}/src/pythonjsonlogger/core.py

@@ -10,12 +10,8 @@ from datetime import datetime, timezone
 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 @@ else:
 
 ### CONSTANTS
 ### ============================================================================
-RESERVED_ATTRS: List[str] = [
+RESERVED_ATTRS: list[str] = [
     "args",
     "asctime",
     "created",
@@ -71,7 +67,7 @@ STYLE_PERCENT_REGEX = re.compile(r"%\((.+?)\)", re.IGNORECASE)  # % style
 
 ## 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 @@ LogData: TypeAlias = Dict[str, Any]
 ### ============================================================================
 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 @@ class BaseJsonFormatter(logging.Formatter):
         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 @@ class BaseJsonFormatter(logging.Formatter):
 
     ## 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 @@ class BaseJsonFormatter(logging.Formatter):
 
     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,7 +398,7 @@ class BaseJsonFormatter(logging.Formatter):
         """
         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.
@@ -410,7 +406,7 @@ class BaseJsonFormatter(logging.Formatter):
         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.

{python_json_logger-4.0.0rc1 → python_json_logger-4.1.0}/src/pythonjsonlogger/defaults.py

@@ -16,17 +16,11 @@ import base64
 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

{python_json_logger-4.0.0rc1 → python_json_logger-4.1.0}/src/pythonjsonlogger/json.py

@@ -12,7 +12,8 @@ from __future__ import annotations
 ## 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:

{python_json_logger-4.0.0rc1 → python_json_logger-4.1.0}/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:
         """

{python_json_logger-4.0.0rc1 → python_json_logger-4.1.0}/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
 
@@ -15,7 +16,7 @@ from . import core
 from . import defaults as d
 from .utils import package_is_available
 
-# We import msgspec after checking it is available
+# We import orjson after checking it is available
 package_is_available("orjson", throw_error=True)
 import orjson  # pylint: disable=wrong-import-position,wrong-import-order
 
@@ -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:

{python_json_logger-4.0.0rc1 → python_json_logger-4.1.0}/tests/test_dictconfig.py

@@ -9,7 +9,8 @@ import io
 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 @@ class LoggingEnvironment:
 
 
 @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)

{python_json_logger-4.0.0rc1 → python_json_logger-4.1.0}/tests/test_formatters.py

@@ -13,13 +13,10 @@ import logging
 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 @@ class LoggingEnvironment:
 
 
 @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}")
@@ -558,6 +555,7 @@ def test_default_encoder_with_timestamp(env: LoggingEnvironment, class_: type[Ba
         (False, bool, False),
         (None, type(None), None),
         (b"some-bytes", str, "c29tZS1ieXRlcw=="),
+        (b"fancy-bytes-\xf0\xf1", str, "ZmFuY3ktYnl0ZXMt8PE="),
         (datetime.time(16, 45, 30, 100), str, "16:45:30.000100"),
         (datetime.date(2024, 5, 5), str, "2024-05-05"),
         (datetime.datetime(2024, 5, 5, 16, 45, 30, 100), str, "2024-05-05T16:45:30.000100"),