Revert "introduce information for hash functions family"

This reverts commit 0d858e3.

Author: picnixz

Lib/test/support/hashlib_helper.py

@@ -65,89 +65,44 @@ class Implementation(enum.StrEnum):
     hashlib = enum.auto()
 
 
-class HashFamily(enum.StrEnum):
-    """Enumerationg containing the algorithmic families known hashes."""
-
-    md5 = enum.auto()
-    sha1 = enum.auto()
-    sha2 = enum.auto()
-    sha3 = enum.auto()
-    shake = enum.auto()
-    blake2 = enum.auto()
-
-
 class HashId(enum.StrEnum):
     """Enumeration containing the canonical digest names.
 
     Those names should only be used by hashlib.new() or hmac.new().
     Their support by _hashlib.new() is not necessarily guaranteed.
     """
 
-    # MD5 family
-    md5 = (enum.auto(), HashFamily.md5)
-
-    # SHA-1 family
-    sha1 = (enum.auto(), HashFamily.sha1)
-
-    # SHA-2 family
-    sha224 = (enum.auto(), HashFamily.sha2)
-    sha256 = (enum.auto(), HashFamily.sha2)
-    sha384 = (enum.auto(), HashFamily.sha2)
-    sha512 = (enum.auto(), HashFamily.sha2)
-
-    # SHA-3 family
-    sha3_224 = (enum.auto(), HashFamily.sha3)
-    sha3_256 = (enum.auto(), HashFamily.sha3)
-    sha3_384 = (enum.auto(), HashFamily.sha3)
-    sha3_512 = (enum.auto(), HashFamily.sha3)
-
-    # SHA-3-XOF family
-    shake_128 = (enum.auto(), HashFamily.shake)
-    shake_256 = (enum.auto(), HashFamily.shake)
-
-    # BLAKE-2 family
-    blake2s = (enum.auto(), HashFamily.blake2)
-    blake2b = (enum.auto(), HashFamily.blake2)
-
-    def __new__(cls, *args):
-        if len(args) == 1:
-            try:
-                return getattr(cls, args[0])
-            except AttributeError as exc:
-                raise ValueError(f"unknown hash algorithm: {args[0]}") from exc
-        elif len(args) != 2:
-            raise TypeError(f"HashId expects 1 to 2 arguments,"
-                            f" got {len(args)}")
-        value, family = args
-        assert isinstance(family, HashFamily), family
-        self = str.__new__(cls, value)
-        self._value_ = value
-        self._family = family
-        return self
+    md5 = enum.auto()
+    sha1 = enum.auto()
 
-    def __repr__(self):
-        return str(self)
+    sha224 = enum.auto()
+    sha256 = enum.auto()
+    sha384 = enum.auto()
+    sha512 = enum.auto()
 
-    @classmethod
-    def from_name(cls, canonical_name):
-        if isinstance(canonical_name, cls):
-            return canonical_name
-        return getattr(cls, canonical_name)
+    sha3_224 = enum.auto()
+    sha3_256 = enum.auto()
+    sha3_384 = enum.auto()
+    sha3_512 = enum.auto()
 
-    @property
-    def family(self):
-        """Get the hash function family."""
-        return self._family
+    shake_128 = enum.auto()
+    shake_256 = enum.auto()
+
+    blake2s = enum.auto()
+    blake2b = enum.auto()
+
+    def __repr__(self):
+        return str(self)
 
     @property
     def is_xof(self):
         """Indicate whether the hash is an extendable-output hash function."""
-        return self.family is HashFamily.shake
+        return self.startswith("shake_")
 
     @property
     def is_keyed(self):
         """Indicate whether the hash is a keyed hash function."""
-        return self.family is HashFamily.blake2
+        return self.startswith("blake2")
 
 
 CANONICAL_DIGEST_NAMES = frozenset(map(str, HashId.__members__))