Moved JSONEncoder to separate file

Author: jrast

flask_jwt_extended/config.py

@@ -1,8 +1,6 @@
-import json
 from datetime import datetime
 from datetime import timedelta
 from datetime import timezone
-from typing import Any
 from typing import Iterable
 from typing import List
 from typing import Optional
@@ -11,37 +9,12 @@
 from typing import Union
 
 from flask import current_app
-from flask.json.provider import _default
 from jwt.algorithms import requires_cryptography
 
+from flask_jwt_extended.json_encoder import JSONEncoder
 from flask_jwt_extended.typing import ExpiresDelta
 
 
-class JSONEncoder(json.JSONEncoder):
-    """The default JSON encoder. Handles extra types compared to the
-    built-in :class:`json.JSONEncoder`.
-
-    -   :class:`datetime.datetime` and :class:`datetime.date` are
-        serialized to :rfc:`822` strings. This is the same as the HTTP
-        date format.
-    -   :class:`decimal.Decimal` is serialized to a string.
-    -   :class:`uuid.UUID` is serialized to a string.
-    -   :class:`dataclasses.dataclass` is passed to
-        :func:`dataclasses.asdict`.
-    -   :class:`~markupsafe.Markup` (or any object with a ``__html__``
-        method) will call the ``__html__`` method to get a string.
-
-    """
-
-    def default(self, o: Any) -> Any:
-        """Convert ``o`` to a JSON serializable type. See
-        :meth:`json.JSONEncoder.default`. Python does not support
-        overriding how basic types like ``str`` or ``list`` are
-        serialized, they are handled before this method.
-        """
-        return _default(o)
-
-
 class _Config(object):
     """
     Helper object for accessing and verifying options in this extension. This

flask_jwt_extended/json_encoder.py

@@ -0,0 +1,36 @@
+import json
+from typing import Any
+
+
+try:
+    # Flask 2.2 deprecated the flask.json.JSONEncoder (see below), lets recreate
+    # a class with the same semantics as the old JSONEncoder.
+
+    from flask.json.provider import DefaultJSONProvider
+
+    class JSONEncoder(json.JSONEncoder):
+        """The default JSON encoder. Handles extra types compared to the
+        built-in :class:`json.JSONEncoder`.
+
+        -   :class:`datetime.datetime` and :class:`datetime.date` are
+            serialized to :rfc:`822` strings. This is the same as the HTTP
+            date format.
+        -   :class:`decimal.Decimal` is serialized to a string.
+        -   :class:`uuid.UUID` is serialized to a string.
+        -   :class:`dataclasses.dataclass` is passed to
+            :func:`dataclasses.asdict`.
+        -   :class:`~markupsafe.Markup` (or any object with a ``__html__``
+            method) will call the ``__html__`` method to get a string.
+
+        """
+
+        def default(self, o: Any) -> Any:
+            """Convert ``o`` to a JSON serializable type. See
+            :meth:`json.JSONEncoder.default`. Python does not support
+            overriding how basic types like ``str`` or ``list`` are
+            serialized, they are handled before this method.
+            """
+            return DefaultJSONProvider.default(o)
+
+except ModuleNotFoundError:  # pragma: no cover
+    from flask.json import JSONEncoder  # type: ignore  # noqa: F401

flask_jwt_extended/tokens.py

@@ -10,10 +10,10 @@
 from typing import Union
 
 import jwt
-from flask.json import JSONEncoder
 
 from flask_jwt_extended.exceptions import CSRFError
 from flask_jwt_extended.exceptions import JWTDecodeError
+from flask_jwt_extended.json_encoder import JSONEncoder
 from flask_jwt_extended.typing import ExpiresDelta