Add test for relative references via $ref to YAML documents

.gitignore

@@ -47,6 +47,9 @@ docs/_build/
 *.sublime-project
 *.sublime-workspace
 
+# Ignore VSCode folder
+/.vscode/
+
 # Ignore virtualenvs (who places it near)
 .venv/
 

sphinxcontrib/openapi/openapi30.py

@@ -9,7 +9,13 @@
 """
 
 import copy
-import collections
+
+try:
+    import collections.abc
+except ImportError:
+    import collections
+    collections.abc = collections
+
 from datetime import datetime
 import itertools
 import json
@@ -64,9 +70,9 @@ def _dict_merge(dct, merge_dct):
         dct: dict onto which the merge is executed
         merge_dct: dct merged into dct
     """
-    for k, v in merge_dct.items():
+    for k in merge_dct.keys():
         if (k in dct and isinstance(dct[k], dict)
-                and isinstance(merge_dct[k], collections.Mapping)):
+                and isinstance(merge_dct[k], collections.abc.Mapping)):
             _dict_merge(dct[k], merge_dct[k])
         else:
             dct[k] = merge_dct[k]

sphinxcontrib/openapi/utils.py

@@ -8,7 +8,13 @@
     :license: BSD, see LICENSE for details.
 """
 
-import collections
+from __future__ import unicode_literals
+
+try:
+    import collections.abc
+except ImportError:
+    import collections
+    collections.abc = collections
 
 import jsonschema
 try:
@@ -33,10 +39,10 @@ def _resolve_refs(uri, spec):
     resolver = jsonschema.RefResolver(uri, spec)
 
     def _do_resolve(node):
-        if isinstance(node, collections.Mapping) and '$ref' in node:
+        if isinstance(node, collections.abc.Mapping) and '$ref' in node:
             with resolver.resolving(node['$ref']) as resolved:
                 return resolved
-        elif isinstance(node, collections.Mapping):
+        elif isinstance(node, collections.abc.Mapping):
             for k, v in node.items():
                 node[k] = _do_resolve(v)
         elif isinstance(node, (list, tuple)):

tests/test_openapi.py

@@ -1611,16 +1611,24 @@ def test_ref_resolving(self):
 
     def test_relative_ref_resolving_on_fs(self):
         baseuri = 'file://%s' % os.path.abspath(__file__)
+
         data = {
             'bar': {
                 '$ref': 'testdata/foo.json#/foo/b',
+            },
+            # check also JSON to YAML references:
+            'baz': {
+                '$ref': 'testdata/foo.yaml#/foo/b',
             }
         }
 
         assert utils._resolve_refs(baseuri, data) == {
             'bar': {
                 'c': True,
-            }
+            },
+            'baz': {
+                'c': True,
+            },
         }
 
     def test_noproperties(self):

tests/testdata/foo.yaml

@@ -0,0 +1,4 @@
+foo:
+  a: 13,
+  b:
+    c: true