Remove lazy string

Author: joshuathompsonlindley

ci/tests/suite/test_lazy_string.py

@@ -24,8 +24,8 @@ keywords = ['flask', 'swagger', 'openapi', 'python', 'api', 'rest', 'openapi3']
 dependencies = [
     "Flask>=2.3.1",
     "PyYAML>=6.0",
-    "jsonschema>=4.17.3",
-    "mistune>=2.0.4",
+    "jsonschema>=4.19.0",
+    "mistune>=3.0.0",
     "six>=1.16.0",
 ]
 

pyproject.toml

@@ -8,11 +8,10 @@
 from .base import (
     BR_SANITIZER,
     Flasgger,
-    LazyJSONEncoder,  # noqa
     MK_SANITIZER,
     NO_SANITIZER,
     Swagger,
 )
 from .constants import OPTIONAL_FIELDS  # noqa
 from .marshmallow_apispec import APISpec, fields, Schema, SwaggerView  # noqa
-from .utils import apispec_to_template, LazyString, swag_from, validate  # noqa
+from .utils import apispec_to_template, swag_from, validate  # noqa

src/flask_openapi/__init__.py

@@ -21,7 +21,6 @@
     Blueprint,
     current_app,
     jsonify,
-    Markup,
     redirect,
     render_template,
     request,
@@ -31,6 +30,7 @@
 from json import JSONEncoder
 from flask.views import MethodView
 from werkzeug.datastructures import Authorization
+from markupsafe import Markup
 
 try:
     from flask_restful.reqparse import RequestParser
@@ -49,7 +49,6 @@
     get_specs,
     get_vendor_extension_fields,
     is_openapi3,
-    LazyString,
     parse_definition_docstring,
     parse_imports,
     swag_annotation,
@@ -978,10 +977,3 @@ def is_openapi3(self):
 
 # backwards compatibility
 Flasgger = Swagger  # noqa
-
-
-class LazyJSONEncoder(JSONEncoder):
-    def default(self, obj):
-        if isinstance(obj, LazyString):
-            return str(obj)
-        return super(LazyJSONEncoder, self).default(obj)

src/flask_openapi/base.py

@@ -927,48 +927,6 @@ def __ge__(self, other):
     def text_type(self):
         return text_type
 
-
-class LazyString(StringLike):
-    """
-    A lazy string *without* caching. The resulting string is regenerated for
-    every request.
-    """
-
-    def __init__(self, func):
-        """
-        Creates a `LazyString` object using `func` as the delayed closure.
-        `func` must return a string.
-        """
-        self._func = func
-
-    def __str__(self):
-        """
-        Returns the actual string.
-        """
-        return self.text_type(self._func())
-
-
-class CachedLazyString(LazyString):
-    """
-    A lazy string with caching.
-    """
-
-    def __init__(self, func):
-        """
-        Uses `__init__()` from the parent and initializes a cache.
-        """
-        super(CachedLazyString, self).__init__(func)
-        self._cache = None
-
-    def __str__(self):
-        """
-        Returns the actual string and caches the result.
-        """
-        if not self._cache:
-            self._cache = self.text_type(self._func())
-        return self._cache
-
-
 def swag_annotation(f):
     @wraps(f)
     def wrapper(*args, **kwargs):