Add NullUnmarshaller

stephenfin · stephenfin · commit 418049e2078e · 2022-10-10T19:14:38.000+01:00
The value 'null' is allowed in OpenAPI 3.1.

Signed-off-by: Stephen Finucane &lt;stephen@that.guru&gt;
diff --git a/openapi_core/unmarshalling/schemas/factories.py b/openapi_core/unmarshalling/schemas/factories.py
@@ -30,6 +30,7 @@
 from openapi_core.unmarshalling.schemas.unmarshallers import (
     IntegerUnmarshaller,
 )
+from openapi_core.unmarshalling.schemas.unmarshallers import NullUnmarshaller
 from openapi_core.unmarshalling.schemas.unmarshallers import NumberUnmarshaller
 from openapi_core.unmarshalling.schemas.unmarshallers import ObjectUnmarshaller
 from openapi_core.unmarshalling.schemas.unmarshallers import StringUnmarshaller
@@ -45,6 +46,7 @@ class SchemaUnmarshallersFactory:
         "boolean": BooleanUnmarshaller,
         "array": ArrayUnmarshaller,
         "object": ObjectUnmarshaller,
+        "null": NullUnmarshaller,
         "any": AnyUnmarshaller,
     }
 
diff --git a/openapi_core/unmarshalling/schemas/unmarshallers.py b/openapi_core/unmarshalling/schemas/unmarshallers.py
@@ -2,7 +2,6 @@
 from functools import partial
 from typing import TYPE_CHECKING
 from typing import Any
-from typing import Dict
 from typing import Iterable
 from typing import List
 from typing import Optional
@@ -12,6 +11,7 @@
 from jsonschema._types import is_array
 from jsonschema._types import is_bool
 from jsonschema._types import is_integer
+from jsonschema._types import is_null
 from jsonschema._types import is_number
 from jsonschema._types import is_object
 from jsonschema.protocols import Validator
@@ -159,6 +159,13 @@ class BooleanUnmarshaller(BaseSchemaUnmarshaller):
     }
 
 
+class NullUnmarshaller(BaseSchemaUnmarshaller):
+
+    FORMATTERS: FormattersDict = {
+        None: Formatter.from_callables(partial(is_null, None), None),
+    }
+
+
 class ComplexUnmarshaller(BaseSchemaUnmarshaller):
     def __init__(
         self,

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`from openapi_core.unmarshalling.schemas.unmarshallers import (`
`31`	`31`	`IntegerUnmarshaller,`
`32`	`32`	`)`
	`33`	`+from openapi_core.unmarshalling.schemas.unmarshallers import NullUnmarshaller`
`33`	`34`	`from openapi_core.unmarshalling.schemas.unmarshallers import NumberUnmarshaller`
`34`	`35`	`from openapi_core.unmarshalling.schemas.unmarshallers import ObjectUnmarshaller`
`35`	`36`	`from openapi_core.unmarshalling.schemas.unmarshallers import StringUnmarshaller`
`@@ -45,6 +46,7 @@ class SchemaUnmarshallersFactory:`
`45`	`46`	`"boolean": BooleanUnmarshaller,`
`46`	`47`	`"array": ArrayUnmarshaller,`
`47`	`48`	`"object": ObjectUnmarshaller,`
	`49`	`+ "null": NullUnmarshaller,`
`48`	`50`	`"any": AnyUnmarshaller,`
`49`	`51`	`}`
`50`	`52`