8000 gh-92647: [Enum] use final status to determine lookup or create by ethanfurman · Pull Request #99500 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-92647: [Enum] use final status to determine lookup or create #99500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 15, 2022
Merged

gh-92647: [Enum] use final status to determine lookup or create #99500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1599ae
use final status to determine lookup or create
ethanfurman Nov 15, 2022
c86c31d
📜🤖 Added by blurb_it.
blurb-it[bot] Nov 15, 2022
d12e69f
Merge branch 'main' into enum-value_lookup
ethanfurman Nov 15, 2022
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
13 changes: 9 additions & 4 deletions Lib/enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,14 +692,16 @@ def __bool__(cls):
"""
return True

def __call__(cls, value, names=None, *, module=None, qualname=None, type=None, start=1, boundary=None):
def __call__(cls, value, names=None, *values, module=None, qualname=None, type=None, start=1, boundary=None):
"""
Either returns an existing member, or creates a new enum class.

This method is used both when an enum class is given a value to match
to an enumeration member (i.e. Color(3)) and for the functional API
(i.e. Color = Enum('Color', names='RED GREEN BLUE')).

The value lookup branch is chosen if the enum is final.

When used for the functional API:

`value` will be the name of the new class.
Expand All @@ -717,12 +719,15 @@ def __call__(cls, value, names=None, *, module=None, qualname=None, type=None, s

`type`, if set, will be mixed in as the first base class.
"""
if names is None: # simple value lookup
if cls._member_map_:
# simple value lookup if members exist
if names:
value = (value, names) + values
return cls.__new__(cls, value)
# otherwise, functional API: we're creating a new Enum type
return cls._create_(
value,
names,
class_name=value,
names=names,
module=module,
qualname=qualname,
type=type,
Expand Down
21 changes: 18 additions & 3 deletions Lib/test/test_enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1321,6 +1321,21 @@ def test_programmatic_function_type_from_subclass_with_start(self):
self.assertIn(e, MinorEnum)
self.assertIs(type(e), MinorEnum)

def test_programmatic_function_is_value_call(self):
class TwoPart(Enum):
ONE = 1, 1.0
TWO = 2, 2.0
THREE = 3, 3.0
self.assertRaisesRegex(ValueError, '1 is not a valid .*TwoPart', TwoPart, 1)
self.assertIs(TwoPart((1, 1.0)), TwoPart.ONE)
self.assertIs(TwoPart(1, 1.0), TwoPart.ONE)
class ThreePart(Enum):
ONE = 1, 1.0, 'one'
TWO = 2, 2.0, 'two'
THREE = 3, 3.0, 'three'
self.assertIs(ThreePart((3, 3.0, 'three')), ThreePart.THREE)
self.assertIs(ThreePart(3, 3.0, 'three'), ThreePart.THREE)

def test_intenum_from_bytes(self):
self.assertIs(IntStooges.from_bytes(b'\x00\x03', 'big'), IntStooges.MOE)
with self.assertRaises(ValueError):
Expand Down Expand Up @@ -1463,7 +1478,7 @@ class MoreColor(Color):
class EvenMoreColor(Color, IntEnum):
chartruese = 7
#
with self.assertRaisesRegex(TypeError, "<enum .Foo.> cannot extend <enum .Color.>"):
with self.assertRaisesRegex(ValueError, "\(.Foo., \(.pink., .black.\)\) is not a valid .*Color"):
Color('Foo', ('pink', 'black'))

def test_exclude_methods(self):
Expand Down Expand Up @@ -4181,7 +4196,7 @@ class TestEnumTypeSubclassing(unittest.TestCase):
Help on class Color in module %s:

class Color(enum.Enum)
| Color(value, names=None, *, module=None, qualname=None, type=None, start=1, boundary=None)
| Color(value, names=None, *values, module=None, qualname=None, type=None, start=1, boundary=None)
|
| Method resolution order:
| Color
Expand Down Expand Up @@ -4237,7 +4252,7 @@ class Color(enum.Enum)
Help on class Color in module %s:

class Color(enum.Enum)
| Color(value, names=None, *, module=None, qualname=None, type=None, start=1)
| Color(value, names=None, *values, module=None, qualname=None, type=None, start=1)
|
| Method resolution order:
| Color
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2022-11-15-04-08-25.gh-issue-92647.cZcjnJ.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Use final status of an enum to determine lookup or creation branch of functional API.
0