python-json-logger 3.1.0__tar.gz → 3.2.1__tar.gz

{python_json_logger-3.1.0/src/python_json_logger.egg-info → python_json_logger-3.2.1}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: python-json-logger
-Version: 3.1.0
+Version: 3.2.1
 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
-Project-URL: Homepage, https://nhairs.github.io/python-json-logger/latest/
+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
@@ -17,16 +17,18 @@ 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: Topic :: System :: Logging
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: typing_extensions
+Requires-Dist: typing_extensions; python_version < "3.10"
 Provides-Extra: dev
-Requires-Dist: orjson; (implementation_name != "pypy" and python_version < "3.13") and extra == "dev"
+Requires-Dist: orjson; implementation_name != "pypy" and extra == "dev"
 Requires-Dist: msgspec; (implementation_name != "pypy" and python_version < "3.13") and extra == "dev"
+Requires-Dist: msgspec-python313-pre; (implementation_name != "pypy" and python_version == "3.13") and extra == "dev"
 Requires-Dist: validate-pyproject[all]; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: pylint; extra == "dev"
@@ -45,9 +47,10 @@ Requires-Dist: mkdocs-gen-files; extra == "dev"
 Requires-Dist: mkdocs-literate-nav; extra == "dev"
 Requires-Dist: mike; extra == "dev"
 
-<!-- [![PyPi](https://img.shields.io/pypi/v/python-json-logger.svg)](https://pypi.python.org/pypi/python-json-logger/)
+[![PyPi](https://img.shields.io/pypi/v/python-json-logger.svg)](https://pypi.python.org/pypi/python-json-logger/)
 [![PyPI - Status](https://img.shields.io/pypi/status/python-json-logger)](https://pypi.python.org/pypi/python-json-logger/)
-[![Python Versions](https://img.shields.io/pypi/pyversions/python-json-logger.svg)](https://github.com/nhairs/python-json-logger) -->
+[![PyPI - Downloads](https://img.shields.io/pypi/dm/python-json-logger)](https://pypi.python.org/pypi/python-json-logger/)
+[![Python Versions](https://img.shields.io/pypi/pyversions/python-json-logger.svg)](https://github.com/nhairs/python-json-logger)
 [![License](https://img.shields.io/github/license/nhairs/python-json-logger.svg)](https://github.com/nhairs/python-json-logger)
 ![Build Status](https://github.com/nhairs/python-json-logger/actions/workflows/test-suite.yml/badge.svg)
 #
@@ -58,10 +61,6 @@ Python JSON Logger enables you produce JSON logs when using Python's `logging` p
 JSON logs are machine readable allowing for much easier parsing and ingestion into log aggregation tools.
 
 
-### 🚨 Important 🚨
-
-This repository is a maintained fork of [madzak/python-json-logger](https://github.com/madzak/python-json-logger) pending [a PEP 541 request](https://github.com/pypi/support/issues/3607) for the PyPI package.  The future direction of the project is being discussed [here](https://github.com/nhairs/python-json-logger/issues/1).
-
 ## Documentation
 
 - [Documentation](https://nhairs.github.io/python-json-logger/latest/)

{python_json_logger-3.1.0 → python_json_logger-3.2.1}/README.md

@@ -1,6 +1,7 @@
-<!-- [![PyPi](https://img.shields.io/pypi/v/python-json-logger.svg)](https://pypi.python.org/pypi/python-json-logger/)
+[![PyPi](https://img.shields.io/pypi/v/python-json-logger.svg)](https://pypi.python.org/pypi/python-json-logger/)
 [![PyPI - Status](https://img.shields.io/pypi/status/python-json-logger)](https://pypi.python.org/pypi/python-json-logger/)
-[![Python Versions](https://img.shields.io/pypi/pyversions/python-json-logger.svg)](https://github.com/nhairs/python-json-logger) -->
+[![PyPI - Downloads](https://img.shields.io/pypi/dm/python-json-logger)](https://pypi.python.org/pypi/python-json-logger/)
+[![Python Versions](https://img.shields.io/pypi/pyversions/python-json-logger.svg)](https://github.com/nhairs/python-json-logger)
 [![License](https://img.shields.io/github/license/nhairs/python-json-logger.svg)](https://github.com/nhairs/python-json-logger)
 ![Build Status](https://github.com/nhairs/python-json-logger/actions/workflows/test-suite.yml/badge.svg)
 #
@@ -11,10 +12,6 @@ Python JSON Logger enables you produce JSON logs when using Python's `logging` p
 JSON logs are machine readable allowing for much easier parsing and ingestion into log aggregation tools.
 
 
-### 🚨 Important 🚨
-
-This repository is a maintained fork of [madzak/python-json-logger](https://github.com/madzak/python-json-logger) pending [a PEP 541 request](https://github.com/pypi/support/issues/3607) for the PyPI package.  The future direction of the project is being discussed [here](https://github.com/nhairs/python-json-logger/issues/1).
-
 ## Documentation
 
 - [Documentation](https://nhairs.github.io/python-json-logger/latest/)

{python_json_logger-3.1.0 → python_json_logger-3.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-json-logger"
-version = "3.1.0"
+version = "3.2.1"
 description = "JSON Log Formatter for the Python Logging Package"
 authors = [
     {name = "Zakaria Zajac", email = "zak@madzak.com"},
@@ -17,7 +17,7 @@ maintainers  = [
 # Dependency Information
 requires-python = ">=3.8"
 dependencies = [
-    "typing_extensions",
+    "typing_extensions;python_version<'3.10'",
 ]
 
 # Extra information
@@ -34,19 +34,21 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: System :: Logging",
     "Typing :: Typed",
 ]
 
 [project.urls]
-Homepage = "https://nhairs.github.io/python-json-logger/latest/"
+Homepage = "https://nhairs.github.io/python-json-logger"
 GitHub = "https://github.com/nhairs/python-json-logger"
 
 [project.optional-dependencies]
 dev = [
     ## Optional but required for dev
-    "orjson;implementation_name!='pypy' and python_version<'3.13'",
+    "orjson;implementation_name!='pypy'",
     "msgspec;implementation_name!='pypy' and python_version<'3.13'",
+    "msgspec-python313-pre;implementation_name!='pypy' and python_version=='3.13'",
     ## Lint
     "validate-pyproject[all]",
     "black",

{python_json_logger-3.1.0 → python_json_logger-3.2.1/src/python_json_logger.egg-info}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: python-json-logger
-Version: 3.1.0
+Version: 3.2.1
 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
-Project-URL: Homepage, https://nhairs.github.io/python-json-logger/latest/
+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
@@ -17,16 +17,18 @@ 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: Topic :: System :: Logging
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: typing_extensions
+Requires-Dist: typing_extensions; python_version < "3.10"
 Provides-Extra: dev
-Requires-Dist: orjson; (implementation_name != "pypy" and python_version < "3.13") and extra == "dev"
+Requires-Dist: orjson; implementation_name != "pypy" and extra == "dev"
 Requires-Dist: msgspec; (implementation_name != "pypy" and python_version < "3.13") and extra == "dev"
+Requires-Dist: msgspec-python313-pre; (implementation_name != "pypy" and python_version == "3.13") and extra == "dev"
 Requires-Dist: validate-pyproject[all]; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: pylint; extra == "dev"
@@ -45,9 +47,10 @@ Requires-Dist: mkdocs-gen-files; extra == "dev"
 Requires-Dist: mkdocs-literate-nav; extra == "dev"
 Requires-Dist: mike; extra == "dev"
 
-<!-- [![PyPi](https://img.shields.io/pypi/v/python-json-logger.svg)](https://pypi.python.org/pypi/python-json-logger/)
+[![PyPi](https://img.shields.io/pypi/v/python-json-logger.svg)](https://pypi.python.org/pypi/python-json-logger/)
 [![PyPI - Status](https://img.shields.io/pypi/status/python-json-logger)](https://pypi.python.org/pypi/python-json-logger/)
-[![Python Versions](https://img.shields.io/pypi/pyversions/python-json-logger.svg)](https://github.com/nhairs/python-json-logger) -->
+[![PyPI - Downloads](https://img.shields.io/pypi/dm/python-json-logger)](https://pypi.python.org/pypi/python-json-logger/)
+[![Python Versions](https://img.shields.io/pypi/pyversions/python-json-logger.svg)](https://github.com/nhairs/python-json-logger)
 [![License](https://img.shields.io/github/license/nhairs/python-json-logger.svg)](https://github.com/nhairs/python-json-logger)
 ![Build Status](https://github.com/nhairs/python-json-logger/actions/workflows/test-suite.yml/badge.svg)
 #
@@ -58,10 +61,6 @@ Python JSON Logger enables you produce JSON logs when using Python's `logging` p
 JSON logs are machine readable allowing for much easier parsing and ingestion into log aggregation tools.
 
 
-### 🚨 Important 🚨
-
-This repository is a maintained fork of [madzak/python-json-logger](https://github.com/madzak/python-json-logger) pending [a PEP 541 request](https://github.com/pypi/support/issues/3607) for the PyPI package.  The future direction of the project is being discussed [here](https://github.com/nhairs/python-json-logger/issues/1).
-
 ## Documentation
 
 - [Documentation](https://nhairs.github.io/python-json-logger/latest/)

{python_json_logger-3.1.0 → python_json_logger-3.2.1}/src/python_json_logger.egg-info/SOURCES.txt

@@ -11,10 +11,14 @@ src/python_json_logger.egg-info/top_level.txt
 src/pythonjsonlogger/__init__.py
 src/pythonjsonlogger/core.py
 src/pythonjsonlogger/defaults.py
+src/pythonjsonlogger/exception.py
 src/pythonjsonlogger/json.py
+src/pythonjsonlogger/jsonlogger.py
 src/pythonjsonlogger/msgspec.py
 src/pythonjsonlogger/orjson.py
 src/pythonjsonlogger/py.typed
+src/pythonjsonlogger/utils.py
 tests/__init__.py
 tests/test_deprecation.py
-tests/test_formatters.py
+tests/test_formatters.py
+tests/test_missing.py

{python_json_logger-3.1.0 → python_json_logger-3.2.1}/src/python_json_logger.egg-info/requires.txt

@@ -1,3 +1,5 @@
+
+[:python_version < "3.10"]
 typing_extensions
 
 [dev]
@@ -18,9 +20,14 @@ mkdocs-gen-files
 mkdocs-literate-nav
 mike
 
-[dev:implementation_name != "pypy" and python_version < "3.13"]
+[dev:implementation_name != "pypy"]
 orjson
+
+[dev:implementation_name != "pypy" and python_version < "3.13"]
 msgspec
 
+[dev:implementation_name != "pypy" and python_version == "3.13"]
+msgspec-python313-pre
+
 [dev:python_version < "3.9"]
 backports.zoneinfo

python_json_logger-3.2.1/src/pythonjsonlogger/__init__.py

@@ -0,0 +1,17 @@
+### IMPORTS
+### ============================================================================
+## Future
+
+## Standard Library
+import warnings
+
+## Installed
+
+## Application
+from . import json
+from . import utils
+
+### CONSTANTS
+### ============================================================================
+ORJSON_AVAILABLE = utils.package_is_available("orjson")
+MSGSPEC_AVAILABLE = utils.package_is_available("msgspec")

{python_json_logger-3.1.0 → python_json_logger-3.2.1}/src/pythonjsonlogger/core.py

@@ -66,9 +66,9 @@ if sys.version_info >= (3, 12):
     RESERVED_ATTRS.sort()
 
 
-STYLE_STRING_TEMPLATE_REGEX = re.compile(r"\$\{(.+?)\}", re.IGNORECASE)
-STYLE_STRING_FORMAT_REGEX = re.compile(r"\{(.+?)\}", re.IGNORECASE)
-STYLE_PERCENT_REGEX = re.compile(r"%\((.+?)\)", re.IGNORECASE)
+STYLE_STRING_TEMPLATE_REGEX = re.compile(r"\$\{(.+?)\}", re.IGNORECASE)  # $ style
+STYLE_STRING_FORMAT_REGEX = re.compile(r"\{(.+?)\}", re.IGNORECASE)  # { style
+STYLE_PERCENT_REGEX = re.compile(r"%\((.+?)\)", re.IGNORECASE)  # % style
 
 ## Type Aliases
 ## -----------------------------------------------------------------------------
@@ -132,6 +132,8 @@ class BaseJsonFormatter(logging.Formatter):
     Must not be used directly.
 
     *New in 3.1*
+
+    *Changed in 3.2*: `defaults` argument is no longer ignored.
     """
 
     _style: Union[logging.PercentStyle, str]  # type: ignore[assignment]
@@ -161,7 +163,8 @@ class BaseJsonFormatter(logging.Formatter):
             style: how to extract log fields from `fmt`
             validate: validate `fmt` against style, if implementing a custom `style` you
                 must set this to `False`.
-            defaults: ignored - kept for compatibility with python 3.10+
+            defaults: a dictionary containing default fields that are added before all other fields and
+                may be overridden. The supplied fields are still subject to `rename_fields`.
             prefix: an optional string prefix added at the beginning of
                 the formatted string
             rename_fields: an optional dict, used to rename field names in the output.
@@ -215,6 +218,7 @@ class BaseJsonFormatter(logging.Formatter):
         self._required_fields = self.parse()
         self._skip_fields = set(self._required_fields)
         self._skip_fields.update(self.reserved_attrs)
+        self.defaults = defaults if defaults is not None else {}
         return
 
     def format(self, record: logging.LogRecord) -> str:
@@ -310,6 +314,9 @@ class BaseJsonFormatter(logging.Formatter):
             message_dict: dictionary that was logged instead of a message. e.g
                 `logger.info({"is_this_message_dict": True})`
         """
+        for field in self.defaults:
+            log_record[self._get_rename(field)] = self.defaults[field]
+
         for field in self._required_fields:
             log_record[self._get_rename(field)] = record.__dict__.get(field)
 

python_json_logger-3.2.1/src/pythonjsonlogger/exception.py

@@ -0,0 +1,27 @@
+### IMPORTS
+### ============================================================================
+## Future
+from __future__ import annotations
+
+## Standard Library
+
+## Installed
+
+## Application
+
+
+### CLASSES
+### ============================================================================
+class PythonJsonLoggerError(Exception):
+    "Generic base clas for all Python JSON Logger exceptions"
+
+
+class MissingPackageError(ImportError, PythonJsonLoggerError):
+    "A required package is missing"
+
+    def __init__(self, name: str, extras_name: str | None = None) -> None:
+        msg = f"The {name!r} package is required but could not be found."
+        if extras_name is not None:
+            msg += f" It can be installed using 'python-json-logger[{extras_name}]'."
+        super().__init__(msg)
+        return

python_json_logger-3.2.1/src/pythonjsonlogger/jsonlogger.py

@@ -0,0 +1,18 @@
+"""Stub module retained for compatibility.
+
+It retains access to old names whilst sending deprecation warnings.
+"""
+
+# pylint: disable=wrong-import-position,unused-import
+
+import warnings
+
+## Throw warning
+warnings.warn(
+    "pythonjsonlogger.jsonlogger has been moved to pythonjsonlogger.json",
+    DeprecationWarning,
+)
+
+## Import names
+from .json import JsonFormatter, JsonEncoder
+from .core import RESERVED_ATTRS

{python_json_logger-3.1.0 → python_json_logger-3.2.1}/src/pythonjsonlogger/msgspec.py

@@ -9,11 +9,15 @@ from __future__ import annotations
 from typing import Any
 
 ## Installed
-import msgspec.json
 
 ## Application
 from . import core
 from . import defaults as d
+from .utils import package_is_available
+
+# We import msgspec after checking it is available
+package_is_available("msgspec", throw_error=True)
+import msgspec.json  # pylint: disable=wrong-import-position,wrong-import-order
 
 
 ### FUNCTIONS

{python_json_logger-3.1.0 → python_json_logger-3.2.1}/src/pythonjsonlogger/orjson.py

@@ -1,4 +1,4 @@
-"""JSON Formatter using [msgspec](https://github.com/ijl/orjson)"""
+"""JSON Formatter using [orjson](https://github.com/ijl/orjson)"""
 
 ### IMPORTS
 ### ============================================================================
@@ -9,11 +9,15 @@ from __future__ import annotations
 from typing import Any
 
 ## Installed
-import orjson
 
 ## Application
 from . import core
 from . import defaults as d
+from .utils import package_is_available
+
+# We import msgspec after checking it is available
+package_is_available("orjson", throw_error=True)
+import orjson  # pylint: disable=wrong-import-position,wrong-import-order
 
 
 ### FUNCTIONS

python_json_logger-3.2.1/src/pythonjsonlogger/utils.py

@@ -0,0 +1,40 @@
+"""Utilities for Python JSON Logger"""
+
+### IMPORTS
+### ============================================================================
+## Future
+from __future__ import annotations
+
+## Standard Library
+import importlib.util
+
+## Installed
+
+## Application
+from .exception import MissingPackageError
+
+
+### FUNCTIONS
+### ============================================================================
+def package_is_available(
+    name: str, *, throw_error: bool = False, extras_name: str | None = None
+) -> bool:
+    """Determine if the given package is available for import.
+
+    Args:
+        name: Import name of the package to check.
+        throw_error: Throw an error if the package is unavailable.
+        extras_name: Extra dependency name to use in `throw_error`'s message.
+
+    Raises:
+        MissingPackageError: When `throw_error` is `True` and the return value would be `False`
+
+    Returns:
+        If the package is available for import.
+    """
+    available = importlib.util.find_spec(name) is not None
+
+    if not available and throw_error:
+        raise MissingPackageError(name, extras_name)
+
+    return available

{python_json_logger-3.1.0 → python_json_logger-3.2.1}/tests/test_deprecation.py

@@ -4,6 +4,8 @@
 from __future__ import annotations
 
 ## Standard Library
+import subprocess
+import sys
 
 ## Installed
 import pytest
@@ -16,7 +18,7 @@ import pythonjsonlogger
 ### ============================================================================
 def test_jsonlogger_deprecated():
     with pytest.deprecated_call():
-        pythonjsonlogger.jsonlogger
+        import pythonjsonlogger.jsonlogger
     return
 
 
@@ -26,3 +28,18 @@ def test_jsonlogger_reserved_attrs_deprecated():
         # a DeprecationWarning and we specifically want the one for RESERVED_ATTRS
         pythonjsonlogger.json.RESERVED_ATTRS
     return
+
+
+@pytest.mark.parametrize(
+    "command",
+    [
+        "from pythonjsonlogger import jsonlogger",
+        "import pythonjsonlogger.jsonlogger",
+        "from pythonjsonlogger.jsonlogger import JsonFormatter",
+        "from pythonjsonlogger.jsonlogger import RESERVED_ATTRS",
+    ],
+)
+def test_import(command: str):
+    output = subprocess.check_output([sys.executable, "-c", f"{command};print('OK')"])
+    assert output.strip() == b"OK"
+    return

{python_json_logger-3.1.0 → python_json_logger-3.2.1}/tests/test_formatters.py

@@ -174,6 +174,18 @@ def test_percentage_format(env: LoggingEnvironment, class_: type[BaseJsonFormatt
     return
 
 
+@pytest.mark.parametrize("class_", ALL_FORMATTERS)
+def test_defaults_field(env: LoggingEnvironment, class_: type[BaseJsonFormatter]):
+    env.set_formatter(class_(defaults={"first": 1, "second": 2}))
+
+    env.logger.info("testing defaults field", extra={"first": 1234})
+    log_json = env.load_json()
+
+    assert log_json["first"] == 1234
+    assert log_json["second"] == 2
+    return
+
+
 @pytest.mark.parametrize("class_", ALL_FORMATTERS)
 def test_rename_base_field(env: LoggingEnvironment, class_: type[BaseJsonFormatter]):
     env.set_formatter(class_(rename_fields={"message": "@message"}))
@@ -186,6 +198,20 @@ def test_rename_base_field(env: LoggingEnvironment, class_: type[BaseJsonFormatt
     return
 
 
+@pytest.mark.parametrize("class_", ALL_FORMATTERS)
+def test_rename_with_defaults(env: LoggingEnvironment, class_: type[BaseJsonFormatter]):
+    """Make sure that the default fields are also renamed."""
+    env.set_formatter(class_(rename_fields={"custom": "@custom"}, defaults={"custom": 1234}))
+
+    msg = "testing rename with defaults"
+    env.logger.info(msg)
+    log_json = env.load_json()
+
+    assert log_json["@custom"] == 1234
+    assert "custom" not in log_json
+    return
+
+
 @pytest.mark.parametrize("class_", ALL_FORMATTERS)
 def test_rename_missing(env: LoggingEnvironment, class_: type[BaseJsonFormatter]):
     env.set_formatter(class_(rename_fields={"missing_field": "new_field"}))
@@ -321,6 +347,19 @@ def test_log_dict(env: LoggingEnvironment, class_: type[BaseJsonFormatter]):
     return
 
 
+@pytest.mark.parametrize("class_", ALL_FORMATTERS)
+def test_log_dict_defaults(env: LoggingEnvironment, class_: type[BaseJsonFormatter]):
+    env.set_formatter(class_(defaults={"d1": 1234, "d2": "hello"}))
+
+    msg = {"d2": "world"}
+    env.logger.info(msg)
+    log_json = env.load_json()
+
+    assert log_json["d1"] == 1234
+    assert log_json["d2"] == "world"
+    return
+
+
 @pytest.mark.parametrize("class_", ALL_FORMATTERS)
 def test_log_extra(env: LoggingEnvironment, class_: type[BaseJsonFormatter]):
     env.set_formatter(class_())

python_json_logger-3.2.1/tests/test_missing.py

@@ -0,0 +1,67 @@
+### IMPORTS
+### ============================================================================
+## Future
+from __future__ import annotations
+
+## Standard Library
+
+## Installed
+import pytest
+
+## Application
+import pythonjsonlogger
+from pythonjsonlogger.utils import package_is_available
+from pythonjsonlogger.exception import MissingPackageError
+
+### CONSTANTS
+### ============================================================================
+MISSING_PACKAGE_NAME = "package_name_is_definintely_not_available"
+MISSING_PACKAGE_EXTRA = "package_extra_that_is_unique"
+
+
+### TESTS
+### ============================================================================
+def test_package_is_available():
+    assert package_is_available("json")
+    return
+
+
+def test_package_not_available():
+    assert not package_is_available(MISSING_PACKAGE_NAME)
+    return
+
+
+def test_package_not_available_throw():
+    with pytest.raises(MissingPackageError) as e:
+        package_is_available(MISSING_PACKAGE_NAME, throw_error=True)
+    assert MISSING_PACKAGE_NAME in e.value.msg
+    assert MISSING_PACKAGE_EXTRA not in e.value.msg
+    return
+
+
+def test_package_not_available_throw_extras():
+    with pytest.raises(MissingPackageError) as e:
+        package_is_available(
+            MISSING_PACKAGE_NAME, throw_error=True, extras_name=MISSING_PACKAGE_EXTRA
+        )
+    assert MISSING_PACKAGE_NAME in e.value.msg
+    assert MISSING_PACKAGE_EXTRA in e.value.msg
+    return
+
+
+## Python JSON Logger Specific
+## -----------------------------------------------------------------------------
+if not pythonjsonlogger.ORJSON_AVAILABLE:
+
+    def test_orjson_import_error():
+        with pytest.raises(MissingPackageError, match="orjson"):
+            import pythonjsonlogger.orjson
+        return
+
+
+if not pythonjsonlogger.MSGSPEC_AVAILABLE:
+
+    def test_msgspec_import_error():
+        with pytest.raises(MissingPackageError, match="msgspec"):
+            import pythonjsonlogger.msgspec
+        return

python_json_logger-3.1.0/src/pythonjsonlogger/__init__.py

@@ -1,40 +0,0 @@
-### IMPORTS
-### ============================================================================
-## Future
-
-## Standard Library
-import warnings
-
-## Installed
-
-## Application
-import pythonjsonlogger.json
-
-### CONSTANTS
-### ============================================================================
-try:
-    import orjson
-
-    ORJSON_AVAILABLE = True
-except ImportError:
-    ORJSON_AVAILABLE = False
-
-
-try:
-    import msgspec
-
-    MSGSPEC_AVAILABLE = True
-except ImportError:
-    MSGSPEC_AVAILABLE = False
-
-
-### DEPRECATED COMPATIBILITY
-### ============================================================================
-def __getattr__(name: str):
-    if name == "jsonlogger":
-        warnings.warn(
-            "pythonjsonlogger.jsonlogger has been moved to pythonjsonlogger.json",
-            DeprecationWarning,
-        )
-        return pythonjsonlogger.json
-    raise AttributeError(f"module {__name__} has no attribute {name}")