Skip to content

bpo-35899: Support of empty and weird strings by Enum #11840

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

Closed
matrixise wants to merge 2 commits into from
Closed

bpo-35899: Support of empty and weird strings by Enum #11840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a0480a
bpo-35899: Support of empty and weird strings by Enum
matrixise Feb 13, 2019
b8b0554
Add the test with the empty string
matrixise Feb 14, 2019
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
15 changes: 8 additions & 7 deletions Lib/enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,19 @@ def _is_descriptor(obj):

def _is_dunder(name):
"""Returns True if a __dunder__ name, False otherwise."""
return (name[:2] == name[-2:] == '__' and
name[2:3] != '_' and
name[-3:-2] != '_' and
len(name) > 4)
return (len(name) > 4 and
name[:2] == name[-2:] == '__' and
name[2] != '_' and
name[-3] != '_')


def _is_sunder(name):
"""Returns True if a _sunder_ name, False otherwise."""
return (name[0] == name[-1] == '_' and
return (len(name) > 2 and
name[0] == name[-1] == '_' and
name[1:2] != '_' and
name[-2:-1] != '_' and
len(name) > 2)
name[-2:-1] != '_')


def _make_class_unpicklable(cls):
"""Make the given class un-picklable."""
Expand Down
12 changes: 12 additions & 0 deletions Lib/test/test_enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2730,6 +2730,18 @@ def cycle_enum():
self.assertEqual(256, len(seen), 'too many composite members created')


class TestEmptyWeirdString(unittest.TestCase):
def test_empty_string(self):
Yay = Enum('Yay', ('', 'B', 'C'))
item = getattr(Yay, '')
self.assertEqual(item.value, 1)

def test_weird_character(self):
Yay = Enum('Yay', ('!', 'B', 'C'))

@tirkarthi tirkarthi Feb 13, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should be a test for the original report where empty string causes an error like Yay = Enum('Yay', ('', 'B', 'C')) in https://bugs.python.org/issue35899#msg334866

@matrixise matrixise Feb 14, 2019

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @tirkarthi
Thank you for your feedback, I have just added this test.

item = getattr(Yay, '!')
self.assertEqual(item.value, 1)


class TestUnique(unittest.TestCase):

def test_unique_clean(self):
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2019-02-13-13-18-32.bpo-35899.sFrRfw.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Enum supports empty and weird strings for the items. Contributed by Maxwell.