summaryrefslogtreecommitdiffstats
path: root/Lib/enum.py
diff options
context:
space:
mode:
authorEthan Furman <ethan@stoneleaf.us>2020-12-10 01:12:11 (GMT)
committerGitHub <noreply@github.com>2020-12-10 01:12:11 (GMT)
commit7cf0aad96d1d20f07d7f0e374885f327c2d5ff27 (patch)
treebabeef9e57bf228cf1714462dfdf7ca1bce97870 /Lib/enum.py
parent6bd94de168b58ac9358277ed6f200490ab26c174 (diff)
downloadcpython-7cf0aad96d1d20f07d7f0e374885f327c2d5ff27.zip
cpython-7cf0aad96d1d20f07d7f0e374885f327c2d5ff27.tar.gz
cpython-7cf0aad96d1d20f07d7f0e374885f327c2d5ff27.tar.bz2
bpo-42517: [Enum] do not convert private names into members (GH-23722)
private names, such as `_Color__hue` and `_Color__hue_` are now normal attributes, and do not become members nor raise exceptions
Diffstat (limited to 'Lib/enum.py')
-rw-r--r--Lib/enum.py19
1 files changed, 18 insertions, 1 deletions
diff --git a/Lib/enum.py b/Lib/enum.py
index 83e050e..74318c3 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -49,6 +49,19 @@ def _is_sunder(name):
name[-2:-1] != '_'
)
+def _is_private(cls_name, name):
+ # do not use `re` as `re` imports `enum`
+ pattern = '_%s__' % (cls_name, )
+ if (
+ len(name) >= 5
+ and name.startswith(pattern)
+ and name[len(pattern)] != '_'
+ and (name[-1] != '_' or name[-2] != '_')
+ ):
+ return True
+ else:
+ return False
+
def _make_class_unpicklable(cls):
"""
Make the given class un-picklable.
@@ -89,7 +102,10 @@ class _EnumDict(dict):
Single underscore (sunder) names are reserved.
"""
- if _is_sunder(key):
+ if _is_private(self._cls_name, key):
+ # do nothing, name will be a normal attribute
+ pass
+ elif _is_sunder(key):
if key not in (
'_order_', '_create_pseudo_member_',
'_generate_next_value_', '_missing_', '_ignore_',
@@ -157,6 +173,7 @@ class EnumMeta(type):
metacls._check_for_existing_members(cls, bases)
# create the namespace dict
enum_dict = _EnumDict()
+ enum_dict._cls_name = cls
# inherit previous flags and _generate_next_value_ function
member_type, first_enum = metacls._get_mixins_(cls, bases)
if first_enum is not None: