Temporarily simplify _finditem, and unskip some tests.

_finditem will be removed (in favor of more robust finding
of scope changes), so this won't matter much, but it's tidier.

Author: Julian

jsonschema/tests/test_jsonschema_test_suite.py

@@ -190,18 +190,6 @@ def leap_second(test):
             subject="ref",
             case_description="Recursive references between schemas",
         )(test)
-        or skip(
-            message=bug(371),
-            subject="ref",
-            case_description="Location-independent identifier",
-        )(test)
-        or skip(
-            message=bug(371),
-            subject="ref",
-            case_description=(
-                "Location-independent identifier with absolute URI"
-            ),
-        )(test)
         or skip(
             message=bug(371),
             subject="ref",
@@ -250,18 +238,6 @@ def leap_second(test):
         or allowed_leading_zeros(test)
         or missing_format(draft6_format_checker)(test)
         or complex_email_validation(test)
-        or skip(
-            message=bug(371),
-            subject="ref",
-            case_description="Location-independent identifier",
-        )(test)
-        or skip(
-            message=bug(371),
-            subject="ref",
-            case_description=(
-                "Location-independent identifier with absolute URI"
-            ),
-        )(test)
         or skip(
             message=bug(371),
             subject="ref",
@@ -295,18 +271,6 @@ def leap_second(test):
         or leap_second(test)
         or missing_format(draft7_format_checker)(test)
         or complex_email_validation(test)
-        or skip(
-            message=bug(371),
-            subject="ref",
-            case_description="Location-independent identifier",
-        )(test)
-        or skip(
-            message=bug(371),
-            subject="ref",
-            case_description=(
-                "Location-independent identifier with absolute URI"
-            ),
-        )(test)
         or skip(
             message=bug(371),
             subject="ref",

jsonschema/validators.py

@@ -1,6 +1,7 @@
 """
 Creation and extension of validators, with implementations for existing drafts.
 """
+from collections import deque
 from collections.abc import Sequence
 from functools import lru_cache
 from urllib.parse import unquote, urldefrag, urljoin, urlsplit
@@ -717,16 +718,14 @@ def resolving(self, ref):
             self.pop_scope()
 
     def _finditem(self, schema, key):
-        results = []
-        if isinstance(schema, dict):
-            if key in schema:
-                results.append(schema)
-
-            for v in schema.values():
-                if isinstance(v, dict):
-                    results += self._finditem(v, key)
-
-        return results
+        values = deque([schema])
+        while values:
+            each = values.pop()
+            if not isinstance(each, dict):
+                continue
+            if key in each:
+                yield each
+            values.extendleft(each.values())
 
     def resolve(self, ref):
         """
@@ -786,6 +785,10 @@ def resolve_fragment(self, document, fragment):
             for subschema in self._finditem(document, keyword):
                 if fragment == subschema[keyword]:
                     return subschema
+        for keyword in ["id", "$id"]:
+            for subschema in self._finditem(document, keyword):
+                if "#" + fragment == subschema[keyword]:
+                    return subschema
 
         # Resolve via path
         parts = unquote(fragment).split("/") if fragment else []