From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 23 Mar 2023 20:56:38 +0000 (-0700)
Subject: gh-102558: [Enum] fix AttributeError during member repr() (GH-102601)
X-Git-Tag: v3.11.3~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8132aefa0f23cb65b004e6f7b203f9f7b47fd997;p=thirdparty%2FPython%2Fcpython.git

gh-102558: [Enum] fix AttributeError during member repr() (GH-102601)

(cherry picked from commit bd063756b34003c1bc7cacf5b1bd90a409180fb6)

Co-authored-by: Dong-hee Na <donghee.na@python.org>
---

diff --git a/Lib/enum.py b/Lib/enum.py
index 5cff41713ae5..ea55f7bbef86 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -1187,6 +1187,8 @@ class Enum(metaclass=EnumType):
         return None
 
     def __repr__(self):
+        if not isinstance(self, Enum):
+            return repr(self)
         v_repr = self.__class__._value_repr_ or repr
         return "<%s.%s: %s>" % (self.__class__.__name__, self._name_, v_repr(self._value_))
 
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index 72dfb9881779..2a305e415cd9 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -11,7 +11,7 @@ import typing
 import builtins as bltns
 from collections import OrderedDict
 from datetime import date
-from enum import Enum, IntEnum, StrEnum, EnumType, Flag, IntFlag, unique, auto
+from enum import Enum, EnumMeta, IntEnum, StrEnum, EnumType, Flag, IntFlag, unique, auto
 from enum import STRICT, CONFORM, EJECT, KEEP, _simple_enum, _test_simple_enum
 from enum import verify, UNIQUE, CONTINUOUS, NAMED_FLAGS, ReprEnum
 from enum import member, nonmember, _iter_bits_lsb
@@ -632,6 +632,13 @@ class _EnumTests:
             theother = auto()
         self.assertEqual(repr(MySubEnum.that), "My name is that.")
 
+    def test_multiple_superclasses_repr(self):
+        class _EnumSuperClass(metaclass=EnumMeta):
+            pass
+        class E(_EnumSuperClass, Enum):
+            A = 1
+        self.assertEqual(repr(E.A), "<E.A: 1>")
+
     def test_reversed_iteration_order(self):
         self.assertEqual(
                 list(reversed(self.MainEnum)),