https://github.com/python/cpython/commit/34653bba644aa5481613f398153757d7357e39ea
commit: 34653bba644aa5481613f398153757d7357e39ea
branch: main
author: Mario Šaško <[email protected]>
committer: ethanfurman <[email protected]>
date: 2024-10-22T13:42:22-07:00
summary:
gh-125259: Fix error notes removal in enum initialization (GH-125647)
files:
A Misc/NEWS.d/next/Library/2024-10-17-16-10-29.gh-issue-125259.oMew0c.rst
M Lib/enum.py
M Lib/test/test_enum.py
diff --git a/Lib/enum.py b/Lib/enum.py
index 4f9912229603a6..27be3fb83b2afb 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -557,22 +557,16 @@ def __new__(metacls, cls, bases, classdict, *,
boundary=None, _simple=False, **k
classdict['_all_bits_'] = 0
classdict['_inverted_'] = None
try:
- exc = None
classdict['_%s__in_progress' % cls] = True
enum_class = super().__new__(metacls, cls, bases, classdict,
**kwds)
classdict['_%s__in_progress' % cls] = False
delattr(enum_class, '_%s__in_progress' % cls)
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.with_traceback(tb)
- #
+ # since 3.12 the note "Error calling __set_name__ on
'_proto_member' instance ..."
+ # is tacked on to the error instead of raising a RuntimeError, so
discard it
+ if hasattr(e, '__notes__'):
+ del e.__notes__
+ raise
# update classdict with any changes made by __init_subclass__
classdict.update(enum_class.__dict__)
#
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index 7184769bfd6fc3..b9e13fb8c3585e 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -1888,6 +1888,25 @@ def test_wrong_inheritance_order(self):
class Wrong(Enum, str):
NotHere = 'error before this point'
+ def test_raise_custom_error_on_creation(self):
+ class InvalidRgbColorError(ValueError):
+ def __init__(self, r, g, b):
+ self.r = r
+ self.g = g
+ self.b = b
+ super().__init__(f'({r}, {g}, {b}) is not a valid RGB color')
+
+ with self.assertRaises(InvalidRgbColorError):
+ class RgbColor(Enum):
+ RED = (255, 0, 0)
+ GREEN = (0, 255, 0)
+ BLUE = (0, 0, 255)
+ INVALID = (256, 0, 0)
+
+ def __init__(self, r, g, b):
+ if not all(0 <= val <= 255 for val in (r, g, b)):
+ raise InvalidRgbColorError(r, g, b)
+
def test_intenum_transitivity(self):
class number(IntEnum):
one = 1
diff --git
a/Misc/NEWS.d/next/Library/2024-10-17-16-10-29.gh-issue-125259.oMew0c.rst
b/Misc/NEWS.d/next/Library/2024-10-17-16-10-29.gh-issue-125259.oMew0c.rst
new file mode 100644
index 00000000000000..4fa6330abea512
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-10-17-16-10-29.gh-issue-125259.oMew0c.rst
@@ -0,0 +1 @@
+Fix the notes removal logic for errors thrown in enum initialization.
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
