From: Ethan Furman <ethan@stoneleaf.us>
Date: Wed, 29 Nov 2023 04:40:12 +0000 (-0800)
Subject: [Enum] update class creation for RuntimeError changes (GH-111815)
X-Git-Tag: v3.13.0a3~599
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9e6ce03953e9ee988d55324dc715b0ef2303cfb;p=thirdparty%2FPython%2Fcpython.git

[Enum] update class creation for RuntimeError changes (GH-111815)
---

diff --git a/Doc/howto/enum.rst b/Doc/howto/enum.rst
index a136c76303c8..ffdafb749c73 100644
--- a/Doc/howto/enum.rst
+++ b/Doc/howto/enum.rst
@@ -1439,7 +1439,6 @@ alias::
     Traceback (most recent call last):
       ...
     ValueError: aliases not allowed in DuplicateFreeEnum:  'GRENE' --> 'GREEN'
-    Error calling __set_name__ on '_proto_member' instance 'GRENE' in 'Color'
 
 .. note::
 
diff --git a/Lib/enum.py b/Lib/enum.py
index 4e76e96d2c91..648401e80be6 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -568,12 +568,16 @@ class EnumType(type):
         try:
             exc = None
             enum_class = super().__new__(metacls, cls, bases, classdict, **kwds)
-        except RuntimeError as e:
-            # any exceptions raised by member.__new__ will get converted to a
-            # RuntimeError, so get that original exception back and raise it instead
-            exc = e.__cause__ or e
+        except Exception as e:
+            # since 3.12 the line "Error calling __set_name__ on '_proto_member' instance ..."
+            # is tacked on to the error instead of raising a RuntimeError
+            # recreate the exception to discard
+            exc = type(e)(str(e))
+            exc.__cause__ = e.__cause__
+            exc.__context__ = e.__context__
+            tb = e.__traceback__
         if exc is not None:
-            raise exc
+            raise exc.with_traceback(tb)
         #
         # update classdict with any changes made by __init_subclass__
         classdict.update(enum_class.__dict__)