Merge pull request #146 from Wim-De-Clercq/issue/145_yaml_loader

Use the json module to take care of the integer keys.

Author: p1c2u

openapi_spec_validator/constructors.py

@@ -0,0 +1,8 @@
+# Use CSafeFile if available
+try:
+    from yaml import CSafeLoader as SafeLoader
+except ImportError:
+    from yaml import SafeLoader
+
+
+__all__ = ['SafeLoader', ]

openapi_spec_validator/handlers/compat.py

@@ -1,20 +1,22 @@
 """OpenAPI spec validator handlers file module."""
 import io
+import json
+
 from yaml import load
 
 from openapi_spec_validator.handlers.base import BaseHandler
+from openapi_spec_validator.handlers.compat import SafeLoader
 from openapi_spec_validator.handlers.utils import uri_to_path
-from openapi_spec_validator.loaders import ExtendedSafeLoader
 
 
 class FileObjectHandler(BaseHandler):
     """OpenAPI spec validator file-like object handler."""
 
-    def __init__(self, loader=ExtendedSafeLoader):
+    def __init__(self, loader=SafeLoader):
         self.loader = loader
 
     def __call__(self, f):
-        return load(f, self.loader)
+        return json.loads(json.dumps(load(f, self.loader)))
 
 
 class FileHandler(FileObjectHandler):

openapi_spec_validator/handlers/file.py

@@ -1,12 +1,12 @@
 """OpenAIP spec validator schemas module."""
 import os
-
 import urllib.parse
 import urllib.request
-from yaml import load
 
 import importlib_resources
-from openapi_spec_validator.loaders import ExtendedSafeLoader
+
+from openapi_spec_validator.handlers.compat import SafeLoader
+from openapi_spec_validator.handlers.file import FileObjectHandler
 
 
 def get_openapi_schema(version):
@@ -19,7 +19,7 @@ def get_openapi_schema(version):
     return schema, schema_url
 
 
-def read_yaml_file(path, loader=ExtendedSafeLoader):
+def read_yaml_file(path, loader=SafeLoader):
     """Open a file, read it and return its contents."""
     with open(path) as fh:
-        return load(fh, loader)
+        return FileObjectHandler(loader=loader)(fh)