use csafeloader if available; use FileObjectHandler to read yaml file

Author: p1c2u

openapi_spec_validator/handlers/compat.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/file.py

@@ -5,13 +5,9 @@
 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
 
-try:
-    from yaml import CSafeLoader as SafeLoader
-except ImportError:
-    from yaml import SafeLoader
-
 
 class FileObjectHandler(BaseHandler):
     """OpenAPI spec validator file-like object handler."""

openapi_spec_validator/schemas.py

@@ -1,16 +1,12 @@
 """OpenAIP spec validator schemas module."""
-import json
 import os
 import urllib.parse
 import urllib.request
 
 import importlib_resources
-from yaml import load
 
-try:
-    from yaml import CSafeLoader as SafeLoader
-except ImportError:
-    from yaml import SafeLoader
+from openapi_spec_validator.handlers.compat import SafeLoader
+from openapi_spec_validator.handlers.file import FileObjectHandler
 
 
 def get_openapi_schema(version):
@@ -26,4 +22,4 @@ def get_openapi_schema(version):
 def read_yaml_file(path, loader=SafeLoader):
     """Open a file, read it and return its contents."""
     with open(path) as fh:
-        return json.loads(json.dumps(load(fh, loader)))
+        return FileObjectHandler(loader=loader)(fh)