Merge pull request #35 from plowman/patch-1

Remove deprecated werkzeug import

Author: ziirish

flask_restx/api.py

@@ -21,7 +21,7 @@
 
 from jsonschema import RefResolver
 
-from werkzeug import cached_property
+from werkzeug.utils import cached_property
 from werkzeug.datastructures import Headers
 from werkzeug.exceptions import HTTPException, MethodNotAllowed, NotFound, NotAcceptable, InternalServerError
 from werkzeug.wrappers import BaseResponse

requirements/install.pip

@@ -1,7 +1,7 @@
 aniso8601>=0.82
 jsonschema
 Flask>=0.8
-werkzeug<=0.16.1
+werkzeug
 pytz
 six>=1.3.0
 enum34; python_version < '3.4'

requirements/test.pip

@@ -5,7 +5,7 @@ pytest==4.6.5; python_version < '3.5'
 pytest==5.0.1; python_version >= '3.5'
 pytest-benchmark==3.2.2
 pytest-cov==2.7.1
-pytest-flask==0.15.0
+pytest-flask==0.15.1
 pytest-mock==1.10.4
 pytest-profiling==1.7.0
 pytest-sugar==0.9.2

tests/test_errors.py

@@ -413,7 +413,7 @@ def test_handle_non_api_error(self, app, client):
 
         response = client.get("/foo")
         assert response.status_code == 404
-        assert response.headers['Content-Type'] == 'text/html'
+        assert response.headers['Content-Type'] == 'text/html; charset=utf-8'
 
     def test_non_api_error_404_catchall(self, app, client):
         api = restx.Api(app, catch_all_404s=True)