Remove context manager from ref() validation.

3 files changed, 27 insertions, 15 deletions

diff --git a/jsonschema/_validators.py b/jsonschema/_validators.py
index 7e5956d..a51681e 100644
--- a/jsonschema/_validators.py
+++ b/jsonschema/_validators.py
@@ -190,9 +190,14 @@ def enum(validator, enums, instance, schema):
 
 
 def ref(validator, ref, instance, schema):
-    with validator.resolver.resolving(ref) as resolved:
+    scope, resolved = validator.resolver.resolve(ref)
+    validator.resolver.push_scope(scope)
+
+    try:
         for error in validator.descend(instance, resolved):
             yield error
+    finally:
+        validator.resolver.pop_scope()
 
 
 def type_draft3(validator, types, instance, schema):
diff --git a/jsonschema/tests/test_validators.py b/jsonschema/tests/test_validators.py
index 0f4c825..f3bb854 100644
--- a/jsonschema/tests/test_validators.py
+++ b/jsonschema/tests/test_validators.py
@@ -633,12 +633,8 @@ class ValidatorTestMixin(object):
         resolver = RefResolver("", {})
         schema = {"$ref" : mock.Mock()}
 
-        @contextmanager
-        def resolving():
-            yield {"type": "integer"}
-
-        with mock.patch.object(resolver, "resolving") as resolve:
-            resolve.return_value = resolving()
+        with mock.patch.object(resolver, "resolve") as resolve:
+            resolve.return_value = "url", {"type": "integer"}
             with self.assertRaises(ValidationError):
                 self.validator_class(schema, resolver=resolver).validate(None)
 
diff --git a/jsonschema/validators.py b/jsonschema/validators.py
index a69accb..435b8db 100644
--- a/jsonschema/validators.py
+++ b/jsonschema/validators.py
@@ -108,7 +108,7 @@ def create(meta_schema, validators=(), version=None, default_types=None):  # noq
                         yield error
             finally:
                 if scope:
-                    self.resolver.scopes_stack.pop()
+                    self.resolver.pop_scope()
 
         def descend(self, instance, schema, path=None, schema_path=None):
             for error in self.iter_errors(instance, schema):
@@ -271,20 +271,36 @@ class RefResolver(object):
         self.scopes_stack.append(
             self.urljoin_cache(self.resolution_scope, scope))
 
+    def pop_scope(self):
+        self.scopes_stack.pop()
+
     @property
     def resolution_scope(self):
         return self.scopes_stack[-1]
 
+
+    # Deprecated, this function is no longer used, but is preserved for
+    # backwards compatibility
     @contextlib.contextmanager
     def in_scope(self, scope):
         self.push_scope(scope)
         try:
             yield
         finally:
-            self.scopes_stack.pop()
+            self.pop_scope()
 
+    # Deprecated, this function is no longer used, but is preserved for
+    # backwards compatibility
     @contextlib.contextmanager
     def resolving(self, ref):
+        url, resolved = self.resolve(ref)
+        self.push_scope(url)
+        try:
+            yield resolved
+        finally:
+            self.pop_scope()
+
+    def resolve(self, ref):
         """
         Context manager which resolves a JSON ``ref`` and enters the
         resolution scope of this ref.
@@ -293,12 +309,7 @@ class RefResolver(object):
 
         """
         url = self.urljoin_cache(self.resolution_scope, ref)
-
-        self.push_scope(url)
-        try:
-            yield self.resolve_cache(url)
-        finally:
-            self.scopes_stack.pop()
+        return url, self.resolve_cache(url)
 
     def resolve_from_url(self, url):
         ref = urldefrag(url)