8000 bpo-39728: Enum: fix duplicate `ValueError` by ethanfurman · Pull Request #22277 · python/cpython · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Lib/enum.py
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ def _generate_next_value_(name, start, count, last_values):

@classmethod
def _missing_(cls, value):
raise ValueError("%r is not a valid %s" % (value, cls.__qualname__))
return None

def __repr__(self):
return "<%s.%s: %r>" % (
Expand Down
19 changes: 18 additions & 1 deletion Lib/test/test_enum.py
Original file line number Diff line number Diff line change
Expand Up @@ -1842,6 +1842,18 @@ class Dupes(Enum):
third = auto()
self.assertEqual([Dupes.first, Dupes.second, Dupes.third], list(Dupes))

def test_default_missing(self):
class Color(Enum):
RED = 1
GREEN = 2
BLUE = 3
try:
Color(7)
except ValueError as exc:
self.assertTrue(exc.__context__ is None)
else:
raise Exception('Exception not raised.')

def test_missing(self):
class Color(Enum):
red = 1
8000 Expand All @@ -1860,7 +1872,12 @@ def _missing_(cls, item):
# trigger not found
return None
self.assertIs(Color('three'), Color.blue)
self.assertRaises(ValueError, Color, 7)
try:
Color(7)
except ValueError as exc:
self.assertTrue(exc.__context__ is None)
else:
raise Exception('Exception not raised.')
try:
Color('bad return')
except TypeError as exc:
Expand Down
1 change: 1 addition & 0 deletions Misc/ACKS
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,7 @@ Marcos Donolo
Dima Dorfman
Yves Dorfsman
Michael Dorman
Andrey Doroschenko
Steve Dower
Allen Downey
Cesar Douady
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix default `_missing_` so a duplicate `ValueError` is not set as the `__context__` of the original `ValueError`
0