mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-08 16:11:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

gh-93910: [Enum] restore member.member restriction while keeping performance boost (GH-94913)

Browse source 
(cherry picked from commit c20186c397)

Co-authored-by: Ethan Furman <ethan@stoneleaf.us>
This commit is contained in:
Miss Islington (bot) 2022-07-16 21:53:41 -07:00 • committed by GitHub
parent 5a34287b5d
commit 30f28ac296
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/enum.py
View file

@ -1114,6 +1114,14 @@ class Enum(metaclass=EnumType):
def __init__(self, *args, **kwds): def __init__(self, *args, **kwds):
pass pass
def __getattribute__(self, name):
self_dict = super().__getattribute__('__dict__')
cls = super().__getattribute__('__class__')
value = super().__getattribute__(name)
if isinstance(value, cls) and name not in self_dict and name in self._member_names_:
raise AttributeError("<enum '%s'> member has no attribute %r" % (cls.__name__, name))
return super().__getattribute__(name)
def _generate_next_value_(name, start, count, last_values): def _generate_next_value_(name, start, count, last_values):
""" """
Generate the next value when not given. Generate the next value when not given.

7
Lib/test/test_enum.py
View file

@ -2611,7 +2611,6 @@ class TestSpecial(unittest.TestCase):
self.assertEqual(Private._Private__corporal, 'Radar') self.assertEqual(Private._Private__corporal, 'Radar')
self.assertEqual(Private._Private__major_, 'Hoolihan') self.assertEqual(Private._Private__major_, 'Hoolihan')
@unittest.skip("Accessing all values retained for performance reasons, see GH-93910")
def test_exception_for_member_from_member_access(self): def test_exception_for_member_from_member_access(self):
with self.assertRaisesRegex(AttributeError, "<enum .Di.> member has no attribute .NO."): with self.assertRaisesRegex(AttributeError, "<enum .Di.> member has no attribute .NO."):
class Di(Enum): class Di(Enum):
@ -2619,6 +2618,12 @@ class TestSpecial(unittest.TestCase):
NO = 0 NO = 0
nope = Di.YES.NO nope = Di.YES.NO
def test_no_exception_for_overridden_member_from_member_access(self):
class Di(Enum):
YES = 1
NO = 0
Di.YES.NO = Di.NO
nope = Di.YES.NO
def test_dynamic_members_with_static_methods(self): def test_dynamic_members_with_static_methods(self):
# #