Fix py27 issue, small improvements

Yelp · Jun 8, 2020 · f88e150 · f88e150
1 parent 1c6e176
commit f88e150
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/swagger_spec_validator/validator20.py b/swagger_spec_validator/validator20.py
@@ -473,7 +473,7 @@ def validate_definition(definition, deref, def_name=None, visited_definitions_id
 
     if not isinstance(definition, dict):
         raise SwaggerValidationError('Definition of {} must be a dict; got {}'.format(
-            def_name or '(no name)', type(definition)))
+            def_name or '(no name)', definition.__class__.__name__))
 
     swagger_type = definition.get('type')
     if isinstance(swagger_type, list):

diff --git a/tests/validator20/validate_definitions_test.py b/tests/validator20/validate_definitions_test.py
@@ -135,9 +135,8 @@ def test_type_array_without_items_succeed_fails():
 
 
 def test_type_object_additional_properties_dict_succeeds():
-    # See https://github.com/OAI/OpenAPI-Specification/issues/668
     definitions = {
-        'example': {
+        'Example': {
             'type': 'object',
             'additionalProperties': {
                 'type': 'string',
@@ -151,7 +150,7 @@ def test_type_object_additional_properties_dict_succeeds():
 def test_type_object_additional_properties_boolean_fails():
     # See https://github.com/OAI/OpenAPI-Specification/issues/668
     definitions = {
-        'example': {
+        'Example': {
             'type': 'object',
             'additionalProperties': False,
         },
@@ -160,8 +159,8 @@ def test_type_object_additional_properties_boolean_fails():
     with pytest.raises(SwaggerValidationError) as exc_info:
         validate_definitions(definitions, lambda x: x)
 
-    assert str(exc_info.value) == "Definition of #/definitions/example/additionalProperties " \
-                                  "must be a dict; got <class 'bool'>"
+    assert str(exc_info.value) == "Definition of #/definitions/Example/additionalProperties " \
+                                  "must be a dict; got bool"
 
 
 def test_inline_model_is_not_valid_validation_fails():