Merge pull request #649 from python-openapi/refactor/move-iter-valid-schemas

Move iter_valid_schemas to schema validator

Author: p1c2u

openapi_core/unmarshalling/schemas/unmarshallers.py

@@ -305,17 +305,7 @@ def evolve(self, schema: Spec) -> "SchemaUnmarshaller":
         )
 
     def find_format(self, value: Any) -> Optional[str]:
-        for schema in self.iter_valid_schemas(value):
+        for schema in self.schema_validator.iter_valid_schemas(value):
             if "format" in schema:
                 return str(schema.getkey("format"))
         return None
-
-    def iter_valid_schemas(self, value: Any) -> Iterator[Spec]:
-        yield self.schema
-
-        one_of_schema = self.schema_validator.get_one_of_schema(value)
-        if one_of_schema is not None:
-            yield one_of_schema
-
-        yield from self.schema_validator.iter_any_of_schemas(value)
-        yield from self.schema_validator.iter_all_of_schemas(value)

openapi_core/validation/schemas/validators.py

@@ -78,6 +78,16 @@ def format_validator_callable(self) -> FormatValidator:
 
         return lambda x: True
 
+    def iter_valid_schemas(self, value: Any) -> Iterator[Spec]:
+        yield self.schema
+
+        one_of_schema = self.get_one_of_schema(value)
+        if one_of_schema is not None:
+            yield one_of_schema
+
+        yield from self.iter_any_of_schemas(value)
+        yield from self.iter_all_of_schemas(value)
+
     def get_one_of_schema(
         self,
         value: Any,