Merge 3d05577 into 1fe65dd

flask_restplus/api.py

@@ -24,8 +24,11 @@
 from flask.signals import got_request_exception
 
 from jsonschema import RefResolver
+try:
+    from werkzeug.utils import cached_property
+except ImportError:
+    from werkzeug import cached_property
 
-from werkzeug import cached_property
 from werkzeug.datastructures import Headers
 from werkzeug.exceptions import HTTPException, MethodNotAllowed, NotFound, NotAcceptable, InternalServerError
 from werkzeug.wrappers import BaseResponse

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'].startswith('text/html')
 
     def test_non_api_error_404_catchall(self, app, client):
         api = restplus.Api(app, catch_all_404s=True)