Skip to content

bpo-40066: [Enum] update str() and format() output #30582

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 26 commits into from
Jan 16, 2022
Merged

bpo-40066: [Enum] update str() and format() output #30582

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
88b2a25
convert tests to PEP-663
ethanfurman Nov 14, 2021
22e8e2f
wip
ethanfurman Dec 1, 2021
881a694
wip
ethanfurman Dec 17, 2021
6cdaa91
wip
ethanfurman Dec 18, 2021
3a17995
wip
ethanfurman Jan 7, 2022
6ff602a
wip
ethanfurman Jan 13, 2022
65a0e31
wip
ethanfurman Jan 13, 2022
06f0dc8
wip
ethanfurman Jan 13, 2022
13c4b92
update __doc__
ethanfurman Jan 13, 2022
7072a3f
fix role
ethanfurman Jan 13, 2022
56647c5
support different display bases for unnamed flag values
ethanfurman Jan 13, 2022
ab4598c
undo PEP 663 library changes
ethanfurman Jan 14, 2022
7b6b17b
adjust internal whitespace in error messages
ethanfurman Jan 14, 2022
bb0c67e
test new doc strings
ethanfurman Jan 14, 2022
837c211
fix "cannoct extend" error; remove dead code
ethanfurman Jan 14, 2022
d36aeda
minor fixes
ethanfurman Jan 14, 2022
cff9b90
fix ssl docs
ethanfurman Jan 14, 2022
2036918
use standard IntEnum and IntFlag
ethanfurman Jan 15, 2022
94e1c64
update test_unicode
ethanfurman Jan 15, 2022
7f99e84
reset PlistFormat to pre-PEP663
ethanfurman Jan 15, 2022
f83f59d
fix docs
ethanfurman Jan 15, 2022
6d54605
doc updates
ethanfurman Jan 15, 2022
515698e
update docs
ethanfurman Jan 15, 2022
2831f99
skip failing doctest because doctest is dumb
ethanfurman Jan 16, 2022
03c1cfc
fix doctest test
ethanfurman Jan 16, 2022
de6ffde
another try
ethanfurman Jan 16, 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
Prev Previous commit
Next Next commit
fix "cannoct extend" error; remove dead code
  • Loading branch information
@ethanfurman
ethanfurman committed Jan 14, 2022
commit 837c211489d026a5ba6e2da776f49ddb961aaea3
36 changes: 0 additions & 36 deletions Lib/enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,15 +541,6 @@ def __new__(metacls, cls, bases, classdict, *, boundary=None, _simple=False, **k
cls_name, member.name, member.value,
cls_name, member2.name, member2.value,
)
# elif enum_length == 3:
# member2 = list(enum_class)[1]
# member3 = list(enum_class)[2]
# list_line = 'list(%s)' % cls_name
# list_repr = '[<%s.%s: %r>, <%s.%s: %r>, <%s.%s: %r>]' % (
# cls_name, member.name, member.value,
# cls_name, member2.name, member2.value,
# cls_name, member3.name, member3.value,
# )
else:
member2 = list(enum_class)[1]
member3 = list(enum_class)[2]
Expand Down Expand Up @@ -1479,16 +1470,6 @@ def __str__(self):
return '%s(%r)' % (cls_name, self._value_)
else:
return "%s.%s" % (cls_name, self._name_)
# elif _is_single_bit(self._value_) or self._boundary_ is not FlagBoundary.KEEP:
# return '|'.join(['%s.%s' % (cls_name, name) for name in self._name_.split('|')])
# else:
# name = []
# for n in self._name_.split('|'):
# if n[0].isdigit():
# name.append(n)
# else:
# name.append('%s.%s' % (cls_name, n))
# return '|'.join(name)

def __bool__(self):
return bool(self._value_)
Expand Down Expand Up @@ -1526,15 +1507,6 @@ class IntFlag(int, ReprEnum, Flag, boundary=EJECT):
Support for integer-based Flags
"""

# def __format__(self, format_spec):
# """
# Returns format using actual value unless __str__ has been overridden.
# """
# str_overridden = type(self).__str__ != Flag.__str__
# value = self
# if not str_overridden:
# value = self._value_
# return int.__format__(value, format_spec)

def __or__(self, other):
if isinstance(other, self.__class__):
Expand Down Expand Up @@ -1714,15 +1686,8 @@ def convert_class(cls):
# it
enum_class = type(cls_name, (etype, ), body, boundary=boundary, _simple=True)
for name in ('__repr__', '__str__', '__format__', '__reduce_ex__'):
# for name in ('__repr__', '__reduce_ex__'):
if name not in body:
setattr(enum_class, name, getattr(etype, name))
# continue
# class_method = getattr(enum_class, name)
# obj_method = getattr(member_type, name, None)
# enum_method = getattr(etype, name, None)
# if obj_method is not None and obj_method is class_method:
# setattr(enum_class, name, enum_method)
gnv_last_values = []
if issubclass(enum_class, Flag):
# Flag / IntFlag
Expand Down Expand Up @@ -1999,7 +1964,6 @@ def _test_simple_enum(checked_enum, simple_enum):
))
for method in (
'__str__', '__repr__', '__reduce_ex__', '__format__',
# '__repr__', '__reduce_ex__',
'__getnewargs_ex__', '__getnewargs__', '__reduce_ex__', '__reduce__'
):
if method in simple_keys and method in checked_keys:
Expand Down
2 changes: 2 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 @@ -1228,11 +1228,13 @@ class Color(Enum):
red = 1
green = 2
blue = 3
#
with self.assertRaises(TypeError):
class MoreColor(Color):
cyan = 4
magenta = 5
yellow = 6
#
with self.assertRaisesRegex(TypeError, "<enum .EvenMoreColor.> cannot extend <enum .Color.>"):
class EvenMoreColor(Color, IntEnum):
chartruese = 7
Expand Down