style fixes

Author: p1c2u

openapi_core/casting/schemas/casters.py

@@ -4,16 +4,17 @@
 
 class PrimitiveCaster(object):
 
-    def __init__(self, caster_callable):
+    def __init__(self, schema, caster_callable):
+        self.schema = schema
         self.caster_callable = caster_callable
 
     def __call__(self, value):
         if value in (None, NoValue):
             return value
         try:
             return self.caster_callable(value)
-        except (ValueError, TypeError) as exc:
-            raise CastError(exc, self.caster_callable)
+        except (ValueError, TypeError):
+            raise CastError(value, self.schema.type.value)
 
 
 class DummyCaster(object):

openapi_core/casting/schemas/factories.py

@@ -8,22 +8,24 @@
 
 class SchemaCastersFactory(object):
 
-    DUMMY_CASTER = DummyCaster()
+    DUMMY_CASTERS = [
+        SchemaType.STRING, SchemaType.OBJECT, SchemaType.ANY,
+    ]
     PRIMITIVE_CASTERS = {
-        SchemaType.STRING: DUMMY_CASTER,
-        SchemaType.INTEGER: PrimitiveCaster(int),
-        SchemaType.NUMBER: PrimitiveCaster(float),
-        SchemaType.BOOLEAN: PrimitiveCaster(forcebool),
-        SchemaType.OBJECT: DUMMY_CASTER,
-        SchemaType.ANY: DUMMY_CASTER,
+        SchemaType.INTEGER: int,
+        SchemaType.NUMBER: float,
+        SchemaType.BOOLEAN: forcebool,
     }
     COMPLEX_CASTERS = {
         SchemaType.ARRAY: ArrayCaster,
     }
 
     def create(self, schema):
-        if schema.type in self.PRIMITIVE_CASTERS:
-            return self.PRIMITIVE_CASTERS[schema.type]
+        if schema.type in self.DUMMY_CASTERS:
+            return DummyCaster()
+        elif schema.type in self.PRIMITIVE_CASTERS:
+            caster_callable = self.PRIMITIVE_CASTERS[schema.type]
+            return PrimitiveCaster(schema, caster_callable)
         elif schema.type in self.COMPLEX_CASTERS:
             caster_class = self.COMPLEX_CASTERS[schema.type]
-            return caster_class(schema=schema, casters_factory=self)
+            return caster_class(schema, self)

openapi_core/deserializing/media_types/deserializers.py

@@ -10,5 +10,5 @@ def __init__(self, mimetype, deserializer_callable):
     def __call__(self, value):
         try:
             return self.deserializer_callable(value)
-        except (ValueError, TypeError, AttributeError) as exc:
+        except (ValueError, TypeError, AttributeError):
             raise DeserializeError(value, self.mimetype)

openapi_core/deserializing/parameters/deserializers.py

@@ -3,7 +3,6 @@
     EmptyParameterValue,
 )
 from openapi_core.schema.parameters.enums import ParameterLocation
-from openapi_core.schema.schemas.types import NoValue
 
 
 class PrimitiveDeserializer(object):
@@ -22,5 +21,5 @@ def __call__(self, value):
             return value
         try:
             return self.deserializer_callable(value)
-        except (ValueError, TypeError, AttributeError) as exc:
+        except (ValueError, TypeError, AttributeError):
             raise DeserializeError(value, self.param.style)

openapi_core/schema/media_types/models.py

@@ -1,4 +1,6 @@
 """OpenAPI core media types models module"""
+
+
 class MediaType(object):
     """Represents an OpenAPI MediaType."""
 

openapi_core/schema/parameters/models.py

@@ -1,6 +1,5 @@
 """OpenAPI core parameters models module"""
 import logging
-import warnings
 
 from openapi_core.schema.parameters.enums import (
     ParameterLocation, ParameterStyle,

openapi_core/validation/request/validators.py

@@ -6,9 +6,8 @@
 from openapi_core.deserializing.exceptions import DeserializeError
 from openapi_core.schema.media_types.exceptions import InvalidContentType
 from openapi_core.schema.operations.exceptions import InvalidOperation
-from openapi_core.schema.parameters.enums import ParameterLocation
 from openapi_core.schema.parameters.exceptions import (
-    OpenAPIParameterError, MissingRequiredParameter, MissingParameter,
+    MissingRequiredParameter, MissingParameter,
 )
 from openapi_core.schema.paths.exceptions import InvalidPath
 from openapi_core.schema.request_bodies.exceptions import MissingRequestBody
@@ -192,7 +191,6 @@ def _deserialise_media_type(self, media_type, value):
         deserializer = deserializers_factory.create(media_type)
         return deserializer(value)
 
-
     def _deserialise_parameter(self, param, value):
         from openapi_core.deserializing.parameters.factories import (
             ParameterDeserializersFactory,
@@ -206,7 +204,6 @@ def _cast(self, param_or_media_type, value):
         if not param_or_media_type.schema:
             return value
 
-        from openapi_core.casting.schemas.exceptions import CastError
         from openapi_core.casting.schemas.factories import SchemaCastersFactory
         casters_factory = SchemaCastersFactory()
         caster = casters_factory.create(param_or_media_type.schema)

openapi_core/validation/response/validators.py

@@ -121,13 +121,11 @@ def _cast(self, param_or_media_type, value):
         if not param_or_media_type.schema:
             return value
 
-        from openapi_core.casting.schemas.exceptions import CastError
         from openapi_core.casting.schemas.factories import SchemaCastersFactory
         casters_factory = SchemaCastersFactory()
         caster = casters_factory.create(param_or_media_type.schema)
         return caster(value)
 
-
     def _unmarshal(self, param_or_media_type, value):
         if not param_or_media_type.schema:
             return value

tests/integration/contrib/flask/test_flask_decorator.py

@@ -105,8 +105,7 @@ def test_endpoint_error(self, client):
                     ),
                     'status': 400,
                     'title': (
-                        "Failed to cast value invalid literal for int() with "
-                        "base 10: 'invalidparameter' to type <class 'int'>"
+                        "Failed to cast value invalidparameter to type integer"
                     )
                 }
             ]

tests/integration/contrib/flask/test_flask_views.py

@@ -92,8 +92,7 @@ def test_endpoint_error(self, client):
                     ),
                     'status': 400,
                     'title': (
-                        "Failed to cast value invalid literal for int() with "
-                        "base 10: 'invalidparameter' to type <class 'int'>"
+                        "Failed to cast value invalidparameter to type integer"
                     )
                 }
             ]