Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: BaseResponse import - replace wekzeug import __version__ by importlib (#573) #575

Merged
merged 5 commits into from
Dec 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Bug Fixes

::

* Fixing werkzeug 3 deprecated version import. Import is replaced by new style version check with importlib (#573) [Ryu-CZ]
* Fixing flask 3.0+ compatibility of `ModuleNotFoundError: No module named 'flask.scaffold'` Import error. (#567) [Ryu-CZ]


Expand Down
9 changes: 1 addition & 8 deletions flask_restx/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,13 @@
InternalServerError,
)

from werkzeug import __version__ as werkzeug_version

if werkzeug_version.split(".")[0] >= "2":
from werkzeug.wrappers import Response as BaseResponse
else:
from werkzeug.wrappers import BaseResponse

from . import apidoc
from .mask import ParseError, MaskError
from .namespace import Namespace
from .postman import PostmanCollectionV1
from .resource import Resource
from .swagger import Swagger
from .utils import default_id, camel_to_dash, unpack, import_check_view_func
from .utils import default_id, camel_to_dash, unpack, import_check_view_func, BaseResponse
from .representations import output_json
from ._http import HTTPStatus

Expand Down
7 changes: 1 addition & 6 deletions flask_restx/resource.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
from flask import request
from flask.views import MethodView
from werkzeug import __version__ as werkzeug_version

if werkzeug_version.split(".")[0] >= "2":
from werkzeug.wrappers import Response as BaseResponse
else:
from werkzeug.wrappers import BaseResponse

from .model import ModelBase

from .utils import unpack
from .utils import unpack, BaseResponse


class Resource(MethodView):
Expand Down
19 changes: 19 additions & 0 deletions flask_restx/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,29 @@
"not_none",
"not_none_sorted",
"unpack",
"BaseResponse",
"import_check_view_func",
)


def import_werkzeug_response():
"""Resolve `werkzeug` `Response` class import because
`BaseResponse` was renamed in version 2.* to `Response`"""
import importlib.metadata

werkzeug_major = int(importlib.metadata.version("werkzeug").split(".")[0])
if werkzeug_major < 2:
from werkzeug.wrappers import BaseResponse

Check warning on line 34 in flask_restx/utils.py

View check run for this annotation

Codecov / codecov/patch

flask_restx/utils.py#L34

Added line #L34 was not covered by tests

return BaseResponse

Check warning on line 36 in flask_restx/utils.py

View check run for this annotation

Codecov / codecov/patch

flask_restx/utils.py#L36

Added line #L36 was not covered by tests

from werkzeug.wrappers import Response

return Response


BaseResponse = import_werkzeug_response()

class FlaskCompatibilityWarning(DeprecationWarning):
pass

Expand Down
5 changes: 5 additions & 0 deletions tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ def test_recursions_with_empty(self):
assert utils.merge(a, b) == b


class UnpackImportResponse(object):
def test_import_werkzeug_response(self):
assert utils.import_werkzeug_response() != None


class CamelToDashTestCase(object):
def test_no_transform(self):
assert utils.camel_to_dash("test") == "test"
Expand Down
Loading