Merge branch 'master' into feature/specs-url-scheme

Author: DustinMoriarty

doc/marshalling.rst

@@ -7,7 +7,7 @@ Response marshalling
 
 
 Flask-RESTX provides an easy way to control what data you actually render in
-your response or expect as in input payload.
+your response or expect as an input payload.
 With the :mod:`~.fields` module, you can use whatever objects (ORM
 models/custom classes/etc.) you want in your resource.
 :mod:`~.fields` also lets you format and filter the response

doc/scaling.rst

@@ -16,7 +16,7 @@ Multiple namespaces
 
 There are many different ways to organize your Flask-RESTX app,
 but here we'll describe one that scales pretty well with larger apps
-and maintains a nice level organization.
+and maintains a nice level of organization.
 
 Flask-RESTX provides a way to use almost the same pattern as Flask's `blueprint`.
 The main idea is to split your app into reusable namespaces.

flask_restx/__about__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "0.2.1.dev"
+__version__ = "0.3.1.dev"
 __description__ = (
     "Fully featured framework for fast, easy and documented API development with Flask"
 )

flask_restx/api.py

@@ -677,7 +677,7 @@ def handle_error(self, e):
         if (
             not isinstance(e, HTTPException)
             and current_app.propagate_exceptions
-            and not isinstance(e, tuple(self.error_handlers.keys()))
+            and not isinstance(e, tuple(self._own_and_child_error_handlers.keys()))
         ):
 
             exc_type, exc_value, tb = sys.exc_info()

package.json

@@ -1,6 +1,6 @@
 {
   "name": "flask-restx",
-  "version": "0.2.1.dev",
+  "version": "0.3.1.dev",
   "description": "Fully featured framework for fast, easy and documented API development with Flask",
   "repository": "python-restx/flask-restx",
   "keywords": [

tests/test_errors.py

@@ -653,3 +653,30 @@ def handle_custom_exception(error):
             "message": "error",
             "test": "value",
         }
+
+    def test_namespace_errorhandler_with_propagate_true(self, app, client):
+        """Exceptions with errorhandler on a namespace should not be
+        returned to client, even if PROPAGATE_EXCEPTIONS is set."""
+        app.config["PROPAGATE_EXCEPTIONS"] = True
+        api = restx.Api(app)
+        namespace = restx.Namespace('test_namespace')
+        api.add_namespace(namespace)
+
+        @namespace.route("/test/", endpoint="test")
+        class TestResource(restx.Resource):
+            def get(self):
+                raise RuntimeError("error")
+
+        @namespace.errorhandler(RuntimeError)
+        def handle_custom_exception(error):
+            return {"message": str(error), "test": "value"}, 400
+
+        response = client.get("/test_namespace/test/")
+        assert response.status_code == 400
+        assert response.content_type == "application/json"
+
+        data = json.loads(response.data.decode("utf8"))
+        assert data == {
+            "message": "error",
+            "test": "value",
+        }