Allow integer response code

Author: p1c2u

openapi_spec_validator/constructors.py

@@ -0,0 +1,17 @@
+from yaml.constructor import SafeConstructor
+
+
+class ExtendedSafeConstructor(SafeConstructor):
+
+    def construct_mapping(self, node, deep=False):
+        """While yaml supports integer keys, these are not valid in
+        json, and will break jsonschema. This method coerces all keys
+        to strings.
+        """
+        mapping = super(ExtendedSafeConstructor, self).construct_mapping(
+            node, deep)
+
+        return {
+            (str(key) if isinstance(key, int) else key): mapping[key]
+            for key in mapping
+        }

openapi_spec_validator/handlers.py

@@ -3,17 +3,24 @@
 
 from six.moves.urllib.parse import urlparse
 from six.moves.urllib.request import urlopen
-from yaml import safe_load
+from yaml import load
+
+from openapi_spec_validator.loaders import ExtendedSafeLoader
 
 
 class UrlHandler:
     """OpenAPI spec validator URL scheme handler."""
 
-    def __init__(self, *allowed_schemes):
+    def __init__(self, *allowed_schemes, **options):
         self.allowed_schemes = allowed_schemes
+        self.options = options
+
+    @property
+    def loader(self):
+        return self.options.get('loader', ExtendedSafeLoader)
 
     def __call__(self, url, timeout=1):
         assert urlparse(url).scheme in self.allowed_schemes
 
         with contextlib.closing(urlopen(url, timeout=timeout)) as fh:
-            return safe_load(fh)
+            return load(fh, self.loader)

openapi_spec_validator/loaders.py

@@ -0,0 +1,19 @@
+from yaml.composer import Composer
+from yaml.parser import Parser
+from yaml.reader import Reader
+from yaml.resolver import Resolver
+from yaml.scanner import Scanner
+
+from openapi_spec_validator.constructors import ExtendedSafeConstructor
+
+
+class ExtendedSafeLoader(
+        Reader, Scanner, Parser, Composer, ExtendedSafeConstructor, Resolver):
+
+    def __init__(self, stream):
+        Reader.__init__(self, stream)
+        Scanner.__init__(self)
+        Parser.__init__(self)
+        Composer.__init__(self)
+        ExtendedSafeConstructor.__init__(self)
+        Resolver.__init__(self)

openapi_spec_validator/schemas.py

@@ -3,7 +3,9 @@
 
 from pkg_resources import resource_filename
 from six.moves.urllib import parse, request
-from yaml import safe_load
+from yaml import load
+
+from openapi_spec_validator.loaders import ExtendedSafeLoader
 
 
 def get_openapi_schema(version):
@@ -15,7 +17,7 @@ def get_openapi_schema(version):
     return schema, schema_url
 
 
-def read_yaml_file(path):
+def read_yaml_file(path, loader=ExtendedSafeLoader):
     """Open a file, read it and return its contents."""
     with open(path) as fh:
-        return safe_load(fh)
+        return load(fh, loader)

tests/integration/conftest.py

@@ -6,6 +6,7 @@
 from yaml import safe_load
 
 from openapi_spec_validator import openapi_v3_spec_validator
+from openapi_spec_validator.schemas import read_yaml_file
 
 
 def spec_url(spec_file, schema='file'):
@@ -17,8 +18,7 @@ def spec_url(spec_file, schema='file'):
 def spec_from_file(spec_file):
     directory = path.abspath(path.dirname(__file__))
     path_full = path.join(directory, spec_file)
-    with open(path_full) as fh:
-        return safe_load(fh)
+    return read_yaml_file(path_full)
 
 
 def spec_from_url(spec_url):

tests/integration/data/v2.0/petstore.yaml

@@ -27,7 +27,7 @@ paths:
           type: integer
           format: int32
       responses:
-        "200":
+        200:
           description: A paged array of pets
           headers:
             x-next:
@@ -45,7 +45,7 @@ paths:
       tags:
         - pets
       responses:
-        "201":
+        '201':
           description: Null response
         default:
           description: unexpected error
@@ -64,7 +64,7 @@ paths:
           description: The id of the pet to retrieve
           type: string
       responses:
-        "200":
+        '200':
           description: Expected response to a valid request
           schema:
             $ref: '#/definitions/Pets'

tests/integration/data/v3.0/petstore.yaml

@@ -22,7 +22,7 @@ paths:
             type: integer
             format: int32
       responses:
-        '200':
+        200:
           description: An paged array of pets
           headers:
             x-next: