updates

Author: ethanfurman

Doc/library/enum.rst

@@ -112,8 +112,7 @@ Module Contents
 
    :class:`EnumDict`
 
-      A subclass of :class:`dict` that tracks order and enforces unique
-      member names.
+      A subclass of :class:`dict` for use when subclassing :class:`EnumType`.
 
    :class:`auto`
 
@@ -154,14 +153,10 @@ Module Contents
 
       Return a list of all power-of-two integers contained in a flag.
 
-   :class:`EnumDict`
-
-      A subclass of :class:`dict` for use when subclassing :class:`EnumType`.
-
 
 .. versionadded:: 3.6  ``Flag``, ``IntFlag``, ``auto``
 .. versionadded:: 3.11  ``StrEnum``, ``EnumCheck``, ``ReprEnum``, ``FlagBoundary``, ``property``, ``member``, ``nonmember``, ``global_enum``, ``show_flag_values``
-.. versionadded:: 3.14  ``EnumDict``
+.. versionadded:: 3.13  ``EnumDict``
 
 ---------------
 

Doc/whatsnew/3.13.rst

@@ -879,18 +879,12 @@ email
   (Contributed by Thomas Dwyer and Victor Stinner for :gh:`102988` to improve
   the :cve:`2023-27043` fix.)
 
-enum
-----
-
-* :class:`~enum.EnumDict` has been made public in :mod:`enum` to better support
-  subclassing :class:`~enum.EnumType`.
 
 enum
 ----
 
-* :class:`enum.EnumDict` has been made public, in order to allow subclasses
-  of :class:`~enum.EnumType` with advanced behavior like having multiple values
-  per member.
+* :class:`~enum.EnumDict` has been made public to better support subclassing
+  :class:`~enum.EnumType`.
 
 
 fractions

Lib/enum.py

@@ -342,13 +342,13 @@ class EnumDict(dict):
     EnumType will use the names found in self._member_names as the
     enumeration member names.
     """
-    def __init__(self):
+    def __init__(self, cls_name):
         super().__init__()
         self._member_names = {} # use a dict -- faster look-up than a list, and keeps insertion order since 3.7
         self._last_values = []
         self._ignore = []
         self._auto_called = False
-        self._cls_name = None
+        self._cls_name = cls_name
 
     def __setitem__(self, key, value):
         """
@@ -359,7 +359,7 @@ def __setitem__(self, key, value):
 
         Single underscore (sunder) names are reserved.
         """
-        if self._cls_name is not None and _is_private(self._cls_name, key):
+        if _is_private(self._cls_name, key):
             # do nothing, name will be a normal attribute
             pass
         elif _is_sunder(key):
@@ -407,7 +407,7 @@ def __setitem__(self, key, value):
             value = value.value
         elif _is_descriptor(value):
             pass
-        elif self._cls_name is not None and _is_internal_class(self._cls_name, value):
+        elif _is_internal_class(self._cls_name, value):
             # do nothing, name will be a normal attribute
             pass
         else:
@@ -479,8 +479,7 @@ def __prepare__(metacls, cls, bases, **kwds):
         # check that previous enum members do not exist
         metacls._check_for_existing_members_(cls, bases)
         # create the namespace dict
-        enum_dict = EnumDict()
-        enum_dict._cls_name = cls
+        enum_dict = EnumDict(cls)
         # inherit previous flags and _generate_next_value_ function
         member_type, first_enum = metacls._get_mixins_(cls, bases)
         if first_enum is not None:

Lib/test/test_enum.py

@@ -5446,7 +5446,7 @@ def test_enum_dict_in_metaclass(self):
         class Meta(type):
             @classmethod
             def __prepare__(metacls, cls, bases, **kwds):
-                return EnumDict()
+                return EnumDict(cls)
 
         class MyClass(metaclass=Meta):
             a = 1
@@ -5459,14 +5459,14 @@ class MyClass(metaclass=Meta):
 
     def test_enum_dict_standalone(self):
         """Test that EnumDict is usable on its own"""
-        enumdict = EnumDict()
+        enumdict = EnumDict('test')
         enumdict['a'] = 1
 
         with self.assertRaises(TypeError):
             enumdict['a'] = 'other value'
 
         # Only MutableMapping interface is overridden for now.
-        # If this starts passing, update the documentation.
+        # If this stops passing, update the documentation.
         enumdict |= {'a': 'other value'}
         self.assertEqual(enumdict['a'], 'other value')
 

Misc/NEWS.d/next/Library/2024-09-04-14-13-14.gh-issue-121720.z9hhXQ.rst

@@ -1,2 +1 @@
-:class:`enum.EnumDict` can now be used on its own, without resorting to
-private API.
+:class:`enum.EnumDict` can now be used without resorting to private API.