Merge pull request #24 from dtkav/python2.7_support

python2.7 support

Author: p1c2u

.gitignore

@@ -99,3 +99,6 @@ ENV/
 
 # mypy
 .mypy_cache/
+
+# pytest
+.pytest_cache/

.travis.yml

@@ -2,6 +2,7 @@ language: python
 sudo: false
 matrix:
   include:
+  - python: 2.7
   - python: 3.2
   - python: 3.3
   - python: 3.4

openapi_spec_validator/decorators.py

@@ -18,7 +18,8 @@ def __init__(self, instance_resolver):
     def __call__(self, func):
         def wrapped(validator, schema_element, instance, schema):
             if not isinstance(instance, dict) or '$ref' not in instance:
-                yield from func(validator, schema_element, instance, schema)
+                for res in func(validator, schema_element, instance, schema):
+                    yield res
                 return
 
             ref = instance['$ref']
@@ -30,7 +31,8 @@ def wrapped(validator, schema_element, instance, schema):
             self._attach_scope(instance)
             with self.visiting.visit(ref):
                 with self.instance_resolver.resolving(ref) as target:
-                    yield from func(validator, schema_element, target, schema)
+                    for res in func(validator, schema_element, target, schema):
+                        yield res
 
         return wrapped
 

openapi_spec_validator/validators.py

@@ -39,21 +39,24 @@ def __init__(self, validator_factory, resolver_handlers):
         self.resolver_handlers = resolver_handlers
 
     def validate(self, spec, spec_url=''):
-        for error in self.iter_errors(spec, spec_url=spec_url):
-            raise error
+        for err in self.iter_errors(spec, spec_url=spec_url):
+            raise err
 
     def iter_errors(self, spec, spec_url=''):
         spec_resolver = self._get_resolver(spec_url, spec)
         dereferencer = self._get_dereferencer(spec_resolver)
 
         validator = self._get_validator(spec_resolver)
-        yield from validator.iter_errors(spec)
+        for err in validator.iter_errors(spec):
+            yield err
 
         paths = spec.get('paths', {})
-        yield from self._iter_paths_errors(paths, dereferencer)
+        for err in self._iter_paths_errors(paths, dereferencer):
+            yield err
 
         components = spec.get('components', {})
-        yield from self._iter_components_errors(components, dereferencer)
+        for err in self._iter_components_errors(components, dereferencer):
+            yield err
 
     def _get_resolver(self, base_uri, referrer):
         return RefResolver(
@@ -81,7 +84,8 @@ def iter_errors(self, components):
         components_deref = self.dereferencer.dereference(components)
 
         schemas = components_deref.get('schemas', {})
-        yield from self._iter_schemas_errors(schemas)
+        for err in self._iter_schemas_errors(schemas):
+            yield err
 
     def _iter_schemas_errors(self, schemas):
         return SchemasValidator(self.dereferencer).iter_errors(schemas)
@@ -95,7 +99,8 @@ def __init__(self, dereferencer):
     def iter_errors(self, schemas):
         schemas_deref = self.dereferencer.dereference(schemas)
         for name, schema in iteritems(schemas_deref):
-            yield from self._iter_schem_errors(schema)
+            for err in self._iter_schem_errors(schema):
+                yield err
 
     def _iter_schem_errors(self, schema):
         return SchemaValidator(self.dereferencer).iter_errors(schema)
@@ -111,7 +116,8 @@ def iter_errors(self, schema):
 
         if 'allOf' in schema_deref:
             for inner_schema in schema_deref['allOf']:
-                yield from self.iter_errors(inner_schema)
+                for err in self.iter_errors(inner_schema):
+                    yield err
 
         required = schema_deref.get('required', [])
         properties = schema_deref.get('properties', {}).keys()
@@ -132,7 +138,8 @@ def __init__(self, dereferencer):
     def iter_errors(self, paths):
         paths_deref = self.dereferencer.dereference(paths)
         for url, path_item in iteritems(paths_deref):
-            yield from self._iter_path_errors(url, path_item)
+            for err in self._iter_path_errors(url, path_item):
+                yield err
 
     def _iter_path_errors(self, url, path_item):
         return PathValidator(self.dereferencer).iter_errors(url, path_item)
@@ -146,7 +153,8 @@ def __init__(self, dereferencer):
     def iter_errors(self, url, path_item):
         path_item_deref = self.dereferencer.dereference(path_item)
 
-        yield from self._iter_path_item_errors(url, path_item_deref)
+        for err in self._iter_path_item_errors(url, path_item_deref):
+            yield err
 
     def _iter_path_item_errors(self, url, path_item):
         return PathItemValidator(self.dereferencer).iter_errors(url, path_item)
@@ -165,14 +173,16 @@ def iter_errors(self, url, path_item):
         path_item_deref = self.dereferencer.dereference(path_item)
 
         parameters = path_item_deref.get('parameters', [])
-        yield from self._iter_parameters_errors(parameters)
+        for err in self._iter_parameters_errors(parameters):
+            yield err
 
         for field_name, operation in iteritems(path_item):
             if field_name not in self.OPERATIONS:
                 continue
 
-            yield from self._iter_operation_errors(
-                url, field_name, operation, parameters)
+            for err in self._iter_operation_errors(
+                    url, field_name, operation, parameters):
+                yield err
 
     def _iter_operation_errors(self, url, name, operation, path_parameters):
         return OperationValidator(self.dereferencer).iter_errors(
@@ -192,7 +202,8 @@ def iter_errors(self, url, name, operation, path_parameters=None):
         operation_deref = self.dereferencer.dereference(operation)
 
         parameters = operation_deref.get('parameters', [])
-        yield from self._iter_parameters_errors(parameters)
+        for err in self._iter_parameters_errors(parameters):
+            yield err
 
         all_params = list(set(
             list(self._get_path_param_names(path_parameters)) +
@@ -205,8 +216,7 @@ def iter_errors(self, url, name, operation, path_parameters=None):
                     "Path parameter '{0}' for '{1}' operation in '{2}' "
                     "was not resolved".format(path, name, url)
                 )
-
-        return []
+        return
 
     def _get_path_param_names(self, params):
         for param in params:

setup.py

@@ -86,6 +86,7 @@ def run_tests(self):
         "Intended Audience :: Developers",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Operating System :: OS Independent",
+        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = {py34,py35,py36}-{default,simplejson}
+envlist = {py27,py34,py35,py36}-{default,simplejson}
 
 [testenv]
 deps =