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.

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

Jump to bottom

[3.12] gh-116040: [Enum] fix test_empty_names test (GH-116508) #116619

Merged
merged 1 commit into from
Mar 11, 2024
Merged

[3.12] gh-116040: [Enum] fix test_empty_names test (GH-116508) #116619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions Lib/enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,6 @@ def _dedent(text):
class _not_given:
def __repr__(self):
return('<not given>')
def __bool__(self):
return False
_not_given = _not_given()

class _auto_null:
Expand Down Expand Up @@ -765,7 +763,7 @@ def __call__(cls, value, names=_not_given, *values, module=None, qualname=None,
)
return cls._create_(
class_name=value,
names=names or None,
names=None if names is _not_given else names,
module=module,
qualname=qualname,
type=type,
Expand Down
18 changes: 7 additions & 11 deletions Lib/test/test_enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3334,17 +3334,13 @@ def test_no_members(self):
Flag(7)

def test_empty_names(self):
for nothing, e_type in (
('', None),
('', int),
([], None),
([], int),
({}, None),
({}, int),
):
empty_enum = Enum('empty_enum', nothing, type=e_type)
self.assertEqual(len(empty_enum), 0)
self.assertRaises(TypeError, 'has no members', empty_enum, 0)
for nothing in '', [], {}:
for e_type in None, int:
empty_enum = Enum('empty_enum', nothing, type=e_type)
self.assertEqual(len(empty_enum), 0)
self.assertRaisesRegex(TypeError, 'has no members', empty_enum, 0)
self.assertRaisesRegex(TypeError, '.int. object is not iterable', Enum, 'bad_enum', names=0)
self.assertRaisesRegex(TypeError, '.int. object is not iterable', Enum, 'bad_enum', 0, type=int)


class TestOrder(unittest.TestCase):
Expand Down