Fix number validator

dz0ny · dz0ny · commit c087ea6021ce · 2019-05-15T18:45:51.000+02:00
The `integer_types` is alaways a tuple. When checking if instance is number or tuple it fails becase it's doing comparison against tuple instead of real type. ➜ python -c "from six import integer_types;import sys;print(integer_types);print(sys.version)" (<type 'int'>, <type 'long'>) 2.7.16 (default, Apr 6 2019, 01:42:57) [GCC 8.3.0] ➜ python3 -c "from six import integer_types;import sys;print(integer_types);print(sys.version)" (<class 'int'>,) 3.7.3 (default, Apr 3 2019, 05:39:12) [GCC 8.3.0] And spec defines number as both int and float https://swagger.io/docs/specification/data-models/data-types/#numbers so both validators need to support both types.
diff --git a/openapi_core/schema/schemas/models.py b/openapi_core/schema/schemas/models.py
@@ -53,8 +53,8 @@ class Schema(object):
     TYPE_VALIDATOR_CALLABLE_GETTER = {
         SchemaType.ANY: lambda x: True,
         SchemaType.BOOLEAN: TypeValidator(bool),
-        SchemaType.INTEGER: TypeValidator(integer_types, exclude=bool),
-        SchemaType.NUMBER: TypeValidator(integer_types, float, exclude=bool),
+        SchemaType.INTEGER: TypeValidator(*integer_types, exclude=bool),
+        SchemaType.NUMBER: TypeValidator(*integer_types, float, exclude=bool),
         SchemaType.STRING: TypeValidator(
             text_type, date, datetime, binary_type, UUID),
         SchemaType.ARRAY: TypeValidator(list, tuple),
@@ -234,10 +234,10 @@ def _unmarshal_integer(self, value, custom_formatters=None, strict=True):
         return int(value)
 
     def _unmarshal_number(self, value, custom_formatters=None, strict=True):
-        if strict and not isinstance(value, (float, )):
+        if strict and not isinstance(value, (float, *integer_types, )):
             raise InvalidSchemaValue("Value {value} is not of type {type}", value, self.type)
 
-        return float(value)
+        return value
 
     def _unmarshal_boolean(self, value, custom_formatters=None, strict=True):
         if strict and not isinstance(value, (bool, )):
diff --git a/tests/unit/schema/test_schemas.py b/tests/unit/schema/test_schemas.py
@@ -262,12 +262,12 @@ def test_number_string_invalid(self):
         with pytest.raises(InvalidSchemaValue):
             schema.unmarshal(value)
 
-    def test_number_int_invalid(self):
+    def test_number_int(self):
         schema = Schema('number')
         value = 1
+        result = schema.unmarshal(value)
 
-        with pytest.raises(InvalidSchemaValue):
-            schema.unmarshal(value)
+        assert result == value
 
 
 class TestSchemaValidate(object):
