Fix uniq comparisons across hashability paths

jsonschema/_utils.py

@@ -217,22 +217,26 @@ def uniq(container):
     brute force when necessary.
     """
     seen_keys = set()
+    supported = []
     unsupported = []
 
     for element in container:
         key = _uniq_key(element)
 
         if key is _UNSUPPORTED:
-            for previous in unsupported:
+            for previous in [*supported, *unsupported]:
                 if equal(previous, element):
                     return False
             unsupported.append(element)
             continue
 
         if key in seen_keys:
             return False
+        if any(equal(previous, element) for previous in unsupported):
+            return False
 
         seen_keys.add(key)
+        supported.append(element)
 
     return True
 

jsonschema/tests/test_utils.py

@@ -223,3 +223,7 @@ def test_unhashable_inside_mapping_falls_back(self):
         self.assertTrue(
             uniq([{"k": Unhashable(1)}, {"k": Unhashable(2)}]),
         )
+
+    def test_equal_hashable_and_unhashable_values_are_not_unique(self):
+        self.assertFalse(uniq([{1}, frozenset({1})]))
+        self.assertFalse(uniq([frozenset({1}), {1}]))