Skip to content

Commit 8a01bc7

Browse files
authored
Merge pull request #341 from hbusul/issue-313
#313 don't use werkzeug, flask 2.0.0 and use Response instead of BaseResponse. Contrib: hbusul reviewer: j5awry
2 parents af807aa + acc4dc9 commit 8a01bc7

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

flask_restx/api.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,13 @@
3434
NotAcceptable,
3535
InternalServerError,
3636
)
37-
from werkzeug.wrappers import BaseResponse
37+
38+
from werkzeug import __version__ as werkzeug_version
39+
40+
if werkzeug_version.split('.')[0] >= '2':
41+
from werkzeug.wrappers import Response as BaseResponse
42+
else:
43+
from werkzeug.wrappers import BaseResponse
3844

3945
from . import apidoc
4046
from .mask import ParseError, MaskError

flask_restx/resource.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@
33

44
from flask import request
55
from flask.views import MethodView
6-
from werkzeug.wrappers import BaseResponse
6+
from werkzeug import __version__ as werkzeug_version
7+
8+
if werkzeug_version.split('.')[0] >= '2':
9+
from werkzeug.wrappers import Response as BaseResponse
10+
else:
11+
from werkzeug.wrappers import BaseResponse
712

813
from .model import ModelBase
914

requirements/install.pip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
aniso8601==8.0.0; python_version < '3.5'
22
aniso8601>=0.82; python_version >= '3.5'
33
jsonschema
4-
Flask>=0.8, <2.0.0
5-
werkzeug <2.0.0
4+
Flask>=0.8, !=2.0.0
5+
werkzeug !=2.0.0
66
pytz
77
six>=1.3.0
88
enum34; python_version < '3.4'

0 commit comments

Comments
 (0)