[3.12] gh-114149: [Enum] fix tuple subclass handling when using custom __new__ (GH...

(cherry picked from commit 33b47a2c2853066b549f242065f6c2e12e18b33b)

Co-authored-by: Ethan Furman <ethan@stoneleaf.us>

diff --git a/Lib/enum.py b/Lib/enum.py
index 1502bfe9158520ddf192c7ba09b7682f8986d11d..0cf88471d504a2a2943f5a72238f8bc3b217334f 100644 (file)
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -254,7 +254,7 @@ class _proto_member:
         delattr(enum_class, member_name)
         # second step: create member based on enum_class
         value = self.value
-        if not isinstance(value, tuple):
+        if type(value) is not tuple:
             args = (value, )
         else:
             args = value
@@ -1757,7 +1757,7 @@ def _simple_enum(etype=Enum, *, boundary=None, use_args=None):
                 else:
                     # create the member
                     if use_args:
-                        if not isinstance(value, tuple):
+                        if type(value) is not tuple:
                             value = (value, )
                         member = new_member(enum_class, *value)
                         value = value[0]
@@ -1807,7 +1807,7 @@ def _simple_enum(etype=Enum, *, boundary=None, use_args=None):
                 else:
                     # create the member
                     if use_args:
-                        if not isinstance(value, tuple):
+                        if type(value) is not tuple:
                             value = (value, )
                         member = new_member(enum_class, *value)
                         value = value[0]

diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index 3bd918fb941c76941b2adfc803f7a8c43b849694..2db3b2f95fc845fd65dce6c4f8437e02857c0190 100644 (file)
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -3163,6 +3163,22 @@ class TestSpecial(unittest.TestCase):
                 [x.value for x in NTEnum],
                 [TTuple(id=0, a=0, blist=[]), TTuple(id=1, a=2, blist=[4]), TTuple(id=2, a=4, blist=[0, 1, 2])],
                 )
+        #
+        class NTDEnum(Enum):
+            def __new__(cls, t_value):
+                member = object.__new__(cls)
+                member._value_ = t_value[0]
+                member.id = t_value[0]
+                member.a = t_value[1]
+                member.blist = t_value[2]
+                return member
+            NONE = TTuple(0, 0, [])
+            A = TTuple(1, 2, [4])
+            B = TTuple(2, 4, [0, 1, 2])
+        self.assertEqual(repr(NTDEnum.NONE), "<NTDEnum.NONE: 0>")
+        self.assertEqual(NTDEnum.NONE.id, 0)
+        self.assertEqual(NTDEnum.A.a, 2)
+        self.assertEqual(NTDEnum.B.blist, [0, 1 ,2])
 
     def test_flag_with_custom_new(self):
         class FlagFromChar(IntFlag):

diff --git a/Misc/NEWS.d/next/Library/2024-01-16-15-59-06.gh-issue-114149.LJ8IPm.rst b/Misc/NEWS.d/next/Library/2024-01-16-15-59-06.gh-issue-114149.LJ8IPm.rst
new file mode 100644 (file)
index 0000000..1403d78
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-01-16-15-59-06.gh-issue-114149.LJ8IPm.rst
@@ -0,0 +1 @@
+Enum: correctly handle tuple subclasses in custom ``__new__``.