Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-95077: [Enum] add code-based deprecation warnings for member.member access #95083

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

Merged
ethanfurman merged 9 commits into from
Jul 25, 2022
Merged

gh-95077: [Enum] add code-based deprecation warnings for member.member access #95083

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d20226c
always store member property in current class
ethanfurman Jul 20, 2022
a81c0e5
issue deprecation warning for member.member access
ethanfurman Jul 21, 2022
6a980de
remove __getattr__ from docs
ethanfurman Jul 21, 2022
01acf3c
update docs
ethanfurman Jul 21, 2022
27e5141
add news entry
ethanfurman Jul 21, 2022
1c158b5
rename NEWS file back to bpo
ethanfurman Jul 21, 2022
e85af4c
trying to figure out correct file name for NEWS entry
ethanfurman Jul 21, 2022
b7659d8
remove faulty news file
ethanfurman Jul 22, 2022
f1412a9
📜🤖 Added by blurb_it.
blurb-it[bot] Jul 22, 2022
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
Next Next commit
always store member property in current class 
also remove __getattr__
  • Loading branch information
@ethanfurman
ethanfurman committed Jul 20, 2022
commit d20226c8f58248485fffa7e27b752a6de8b794bf
40 changes: 10 additions & 30 deletions Lib/enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,13 @@ class property(DynamicClassAttribute):
a corresponding enum member.
"""

member = None

def __get__(self, instance, ownerclass=None):
if instance is None:
try:
return ownerclass._member_map_[self.name]
except KeyError:
if self.member is not None:
return self.member
else:
raise AttributeError(
'%r has no attribute %r' % (ownerclass, self.name)
)
Expand Down Expand Up @@ -309,20 +311,14 @@ def __set_name__(self, enum_class, member_name):
else:
need_override = True
# keep looking for an enum.property
if descriptor and not need_override:
# previous enum.property found, no further action needed
pass
elif descriptor and need_override:
redirect = property()
redirect.__set_name__(enum_class, member_name)
# Previous enum.property found, but some other inherited attribute
# is in the way; copy fget, fset, fdel to this one.
redirect = property()
redirect.member = enum_member
redirect.__set_name__(enum_class, member_name)
if descriptor:
redirect.fget = descriptor.fget
redirect.fset = descriptor.fset
redirect.fdel = descriptor.fdel
setattr(enum_class, member_name, redirect)
else:
setattr(enum_class, member_name, enum_member)
setattr(enum_class, member_name, redirect)
# now add to _member_map_ (even aliases)
enum_class._member_map_[member_name] = enum_member
try:
Expand Down Expand Up @@ -740,22 +736,6 @@ def __dir__(cls):
# return whatever mixed-in data type has
return sorted(set(dir(cls._member_type_)) | interesting)

def __getattr__(cls, name):
"""
Return the enum member matching `name`

We use __getattr__ instead of descriptors or inserting into the enum
class' __dict__ in order to support `name` and `value` being both
properties for enum members (which live in the class' __dict__) and
enum members themselves.
"""
if _is_dunder(name):
raise AttributeError(name)
try:
return cls._member_map_[name]
except KeyError:
raise AttributeError(name) from None

def __getitem__(cls, name):
"""
Return the member matching `name`.
Expand Down