From dcc8ce44c74492670e6bfbde588a2acbf8f365e0 Mon Sep 17 00:00:00 2001 From: Dong-hee Na Date: Thu, 22 Jun 2017 01:52:32 +0900 Subject: bpo-30616: Functional API of enum allows to create empty enums. (#2304) * bpo-30616: Functional API of enum allows to create empty enums. * Update NEWS move addition to avoid conflict --- Lib/enum.py | 2 +- Lib/test/test_enum.py | 20 ++++++++++++++++++++ Misc/NEWS | 3 +++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/Lib/enum.py b/Lib/enum.py index 056400d..73dd613 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -381,7 +381,7 @@ class EnumMeta(type): # special processing needed for names? if isinstance(names, str): names = names.replace(',', ' ').split() - if isinstance(names, (tuple, list)) and isinstance(names[0], str): + if isinstance(names, (tuple, list)) and names and isinstance(names[0], str): original_names, names = names, [] last_values = [] for count, name in enumerate(original_names): diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index a973081..ea52de7 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -2291,6 +2291,26 @@ class TestIntFlag(unittest.TestCase): self.assertIs(type(e), Perm) + def test_programatic_function_from_empty_list(self): + Perm = enum.IntFlag('Perm', []) + lst = list(Perm) + self.assertEqual(len(lst), len(Perm)) + self.assertEqual(len(Perm), 0, Perm) + Thing = enum.Enum('Thing', []) + lst = list(Thing) + self.assertEqual(len(lst), len(Thing)) + self.assertEqual(len(Thing), 0, Thing) + + + def test_programatic_function_from_empty_tuple(self): + Perm = enum.IntFlag('Perm', ()) + lst = list(Perm) + self.assertEqual(len(lst), len(Perm)) + self.assertEqual(len(Perm), 0, Perm) + Thing = enum.Enum('Thing', ()) + self.assertEqual(len(lst), len(Thing)) + self.assertEqual(len(Thing), 0, Thing) + def test_containment(self): Perm = self.Perm R, W, X = Perm diff --git a/Misc/NEWS b/Misc/NEWS index f8833aa..299d9c2 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -385,6 +385,9 @@ Library correctly returns the ``127.0.0.1`` host, instead of treating ``@evil.com`` as the host in an authentification (``login@host``). +- bpo-30616: Functional API of enum allows to create empty enums. + Patched by Dong-hee Na + - bpo-30038: Fix race condition between signal delivery and wakeup file descriptor. Patch by Nathaniel Smith. -- cgit v0.12