Skip to content
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.

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

[3.12] gh-109022: [Enum] require names=() to create empty enum type (GH-109048) #109122

Merged
merged 1 commit into from
Sep 12, 2023
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
5 changes: 5 additions & 0 deletions Lib/enum.py
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,11 @@ def __call__(cls, value, names=None, *values, module=None, qualname=None, type=N
value = (value, names) + values
return cls.__new__(cls, value)
# otherwise, functional API: we're creating a new Enum type
if names is None and type is None:
# no body? no data-type? possibly wrong usage
raise TypeError(
f"{cls} has no members; specify `names=()` if you meant to create a new, empty, enum"
)
return cls._create_(
class_name=value,
names=names,
Expand Down
11 changes: 7 additions & 4 deletions Lib/test/test_enum.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ def __str__(self):
return self.name.title()
def __format__(self, spec):
return ''.join(reversed(self.name))
self.NewBaseEnum = NewBaseEnum
class NewSubEnum(NewBaseEnum):
first = auto()
self.NewSubEnum = NewSubEnum
Expand Down Expand Up @@ -342,10 +343,8 @@ def __str__(self):
return self.name.title()
def __format__(self, spec):
return ''.join(reversed(self.name))
NewBaseEnum = self.enum_type('NewBaseEnum', dict(__format__=__format__, __str__=__str__))
class NewSubEnum(NewBaseEnum):
first = auto()
self.NewSubEnum = NewBaseEnum('NewSubEnum', 'first')
self.NewBaseEnum = self.enum_type('NewBaseEnum', dict(__format__=__format__, __str__=__str__))
self.NewSubEnum = self.NewBaseEnum('NewSubEnum', 'first')
#
def _generate_next_value_(name, start, last, values):
pass
Expand Down Expand Up @@ -561,6 +560,10 @@ class SubEnum(SuperEnum):
self.assertTrue('description' not in dir(SubEnum))
self.assertTrue('description' in dir(SubEnum.sample), dir(SubEnum.sample))

def test_empty_enum_has_no_values(self):
with self.assertRaisesRegex(TypeError, "<.... 'NewBaseEnum'> has no members"):
self.NewBaseEnum(7)

def test_enum_in_enum_out(self):
Main = self.MainEnum
self.assertIs(Main(Main.first), Main.first)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Enum: require ``names=()`` or ``type=...`` to create an empty enum using
the functional syntax.