Skip to content

#313 don't use werkzeug, flask 2.0.0 and use Response instead of BaseResponse #341

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 5, 2021
Merged

#313 don't use werkzeug, flask 2.0.0 and use Response instead of BaseResponse #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion flask_restx/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,13 @@
NotAcceptable,
InternalServerError,
)
from werkzeug.wrappers import BaseResponse

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
Expand Down
7 changes: 6 additions & 1 deletion flask_restx/resource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@

from flask import request
from flask.views import MethodView
from werkzeug.wrappers import BaseResponse
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

Expand Down
4 changes: 2 additions & 2 deletions requirements/install.pip
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
aniso8601==8.0.0; python_version < '3.5'
aniso8601>=0.82; python_version >= '3.5'
jsonschema
Flask>=0.8, <2.0.0
werkzeug <2.0.0
Flask>=0.8, !=2.0.0
werkzeug !=2.0.0
pytz
six>=1.3.0
enum34; python_version < '3.4'