Merge remote-tracking branch 'origin/rfc3986_patch' into rfc3986_patch

Author: agoose77

jsonschema/validators.py

@@ -680,17 +680,10 @@ def resolving(self, ref):
 
         """
 
-        url, resolved = self.resolve(ref)
-        self.push_scope(url)
-        try:
-            yield resolved
-        finally:
-            self.pop_scope()
-
-    def resolve(self, ref):
         assert self.base_uri
         url = self._urljoin_cache(self.base_uri, ref)
-        return url, self._remote_cache(url)
+        with self.in_scope(url):
+            yield self._remote_cache(url)
 
     def resolve_from_url(self, url):
         if url.fragment:
@@ -726,11 +719,15 @@ def resolve_fragment(self, document, fragment):
         """
 
         fragment = fragment.lstrip(u"/")
-        parts = unquote(fragment).split(u"/") if fragment else []
+        if not fragment:
+            return document
 
-        for part in parts:
-            part = part.replace(u"~1", u"/").replace(u"~0", u"~")
+        parts = [p.replace(u"~1", u"/").replace(u"~0", u"~")
+                 for p in unquote(fragment).split(u"/")]
+
+        scopes = []
 
+        for part in parts:
             if isinstance(document, Sequence):
                 # Array indexes should be turned into integers
                 try: