refactor: Hasher can do sets

nedbat · nedbat · commit 9928c5123dcf · 2025-12-18T18:21:54.000-05:00
diff --git a/coverage/misc.py b/coverage/misc.py
@@ -176,10 +176,12 @@ def update(self, v: Any) -> None:
                 for e in v:
                     self.update(e)
             case dict():
-                keys = v.keys()
-                for k in sorted(keys):
+                for k, kv in sorted(v.items()):
                     self.update(k)
-                    self.update(v[k])
+                    self.update(kv)
+            case set():
+                for e in sorted(v):
+                    self.update(e)
             case _:
                 for k in dir(v):
                     if k.startswith("__"):
@@ -191,8 +193,12 @@ def update(self, v: Any) -> None:
                     self.update(a)
         self.hash.update(b".")
 
+    def digest(self) -> bytes:
+        """Get the full binary digest of the hash."""
+        return self.hash.digest()
+
     def hexdigest(self) -> str:
-        """Retrieve the hex digest of the hash."""
+        """Retrieve a 32-char hex digest of the hash."""
         return self.hash.hexdigest()[:32]
 
 
diff --git a/tests/test_misc.py b/tests/test_misc.py
@@ -23,6 +23,14 @@ class HasherTest(CoverageTest):
 
     run_in_temp_dir = False
 
+    def test_none_hashing(self) -> None:
+        h1 = Hasher()
+        h1.update([1, None, 2, None])
+        h2 = Hasher()
+        h2.update([1, 2])
+        assert h1.hexdigest() != h2.hexdigest()
+        assert h1.digest() != h2.digest()
+
     def test_string_hashing(self) -> None:
         h1 = Hasher()
         h1.update("Hello, world!")
@@ -32,34 +40,52 @@ def test_string_hashing(self) -> None:
         h3.update("Hello, world!")
         assert h1.hexdigest() != h2.hexdigest()
         assert h1.hexdigest() == h3.hexdigest()
+        assert h1.digest() != h2.digest()
+        assert h1.digest() == h3.digest()
 
     def test_bytes_hashing(self) -> None:
         h1 = Hasher()
         h1.update(b"Hello, world!")
         h2 = Hasher()
         h2.update(b"Goodbye!")
         assert h1.hexdigest() != h2.hexdigest()
+        assert h1.digest() != h2.digest()
 
     def test_unicode_hashing(self) -> None:
         h1 = Hasher()
         h1.update("Hello, world! \N{SNOWMAN}")
         h2 = Hasher()
         h2.update("Goodbye!")
         assert h1.hexdigest() != h2.hexdigest()
+        assert h1.digest() != h2.digest()
 
     def test_dict_hashing(self) -> None:
         h1 = Hasher()
         h1.update({"a": 17, "b": 23})
         h2 = Hasher()
         h2.update({"b": 23, "a": 17})
         assert h1.hexdigest() == h2.hexdigest()
+        assert h1.digest() == h2.digest()
 
     def test_dict_collision(self) -> None:
         h1 = Hasher()
         h1.update({"a": 17, "b": {"c": 1, "d": 2}})
         h2 = Hasher()
         h2.update({"a": 17, "b": {"c": 1}, "d": 2})
         assert h1.hexdigest() != h2.hexdigest()
+        assert h1.digest() != h2.digest()
+
+    def test_set_hashing(self) -> None:
+        h1 = Hasher()
+        h1.update({(1, 2), (3, 4), (5, 6)})
+        h2 = Hasher()
+        h2.update({(5, 6), (1, 2), (3, 4)})
+        h3 = Hasher()
+        h3.update({(1, 2)})
+        assert h1.hexdigest() == h2.hexdigest()
+        assert h1.hexdigest() != h3.hexdigest()
+        assert h1.digest() == h2.digest()
+        assert h1.digest() != h3.digest()
 
 
 class RemoveFileTest(CoverageTest):
