more fixes

Author: ethanfurman

Doc/library/enum.rst

@@ -834,8 +834,8 @@ Data Types
    for defining enum classes (see :ref:`prepare`).
    It is exposed to allow subclasses of :class:`EnumType` with advanced
    behavior like having multiple values per member.
-   It prevents reusing member names, with special behavior for names that
-   start with an underscore.
+   It should be called with the name of the enum class being created, otherwise
+   private names and internal classes will not be handled correctly.
 
    Note that only the :class:`~collections.abc.MutableMapping` interface
    (:meth:`~object.__setitem__` and :meth:`~dict.update`) is overridden.

Lib/enum.py

@@ -342,7 +342,7 @@ class EnumDict(dict):
     EnumType will use the names found in self._member_names as the
     enumeration member names.
     """
-    def __init__(self, cls_name):
+    def __init__(self, cls_name=None):
         super().__init__()
         self._member_names = {} # use a dict -- faster look-up than a list, and keeps insertion order since 3.7
         self._last_values = []
@@ -359,7 +359,7 @@ def __setitem__(self, key, value):
 
         Single underscore (sunder) names are reserved.
         """
-        if _is_private(self._cls_name, key):
+        if self._cls_name is not None and _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 _is_internal_class(self._cls_name, value):
+        elif self._cls_name is not None and _is_internal_class(self._cls_name, value):
             # do nothing, name will be a normal attribute
             pass
         else:

Lib/test/test_enum.py

@@ -5459,7 +5459,7 @@ class MyClass(metaclass=Meta):
 
     def test_enum_dict_standalone(self):
         """Test that EnumDict is usable on its own"""
-        enumdict = EnumDict('test')
+        enumdict = EnumDict()
         enumdict['a'] = 1
 
         with self.assertRaises(TypeError):