Merge pull request #76 from robyoung/issue-75

Fix Issue #75: Catch TypeError in marshalling

Author: j5awry

flask_restx/fields.py

@@ -459,7 +459,7 @@ def format(self, value):
             if value is None:
                 return self.default
             return int(value)
-        except ValueError as ve:
+        except (ValueError, TypeError) as ve:
             raise MarshallingError(ve)
 
 
@@ -473,7 +473,7 @@ class Float(NumberMixin, Raw):
     def format(self, value):
         try:
             return float(value)
-        except ValueError as ve:
+        except (ValueError, TypeError) as ve:
             raise MarshallingError(ve)
 
 

tests/test_fields.py

@@ -276,10 +276,14 @@ def test_with_default(self):
     def test_value(self, value, expected):
         self.assert_field(fields.Integer(), value, expected)
 
-    def test_decode_error(self):
+    def test_decode_error_on_invalid_value(self):
         field = fields.Integer()
         self.assert_field_raises(field, "an int")
 
+    def test_decode_error_on_invalid_type(self):
+        field = fields.Integer()
+        self.assert_field_raises(field, {"a": "dict"})
+
 
 class BooleanFieldTest(BaseFieldTestMixin, FieldTestCase):
     field_class = fields.Boolean
@@ -330,10 +334,14 @@ def test_value(self, value, expected):
     def test_raises(self):
         self.assert_field_raises(fields.Float(), "bar")
 
-    def test_decode_error(self):
+    def test_decode_error_on_invalid_value(self):
         field = fields.Float()
         self.assert_field_raises(field, "not a float")
 
+    def test_decode_error_on_invalid_type(self):
+        field = fields.Float()
+        self.assert_field_raises(field, {"a": "dict"})
+
 
 PI_STR = (
     "3.141592653589793238462643383279502884197169399375105820974944592307816406286208998628034825342117"