Skip to content

Commit 837c211

Browse files
committed
fix "cannoct extend" error; remove dead code
1 parent bb0c67e commit 837c211

File tree

2 files changed

+2
-36
lines changed

2 files changed

+2
-36
lines changed

Lib/enum.py

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -541,15 +541,6 @@ def __new__(metacls, cls, bases, classdict, *, boundary=None, _simple=False, **k
541541
cls_name, member.name, member.value,
542542
cls_name, member2.name, member2.value,
543543
)
544-
# elif enum_length == 3:
545-
# member2 = list(enum_class)[1]
546-
# member3 = list(enum_class)[2]
547-
# list_line = 'list(%s)' % cls_name
548-
# list_repr = '[<%s.%s: %r>, <%s.%s: %r>, <%s.%s: %r>]' % (
549-
# cls_name, member.name, member.value,
550-
# cls_name, member2.name, member2.value,
551-
# cls_name, member3.name, member3.value,
552-
# )
553544
else:
554545
member2 = list(enum_class)[1]
555546
member3 = list(enum_class)[2]
@@ -1479,16 +1470,6 @@ def __str__(self):
14791470
return '%s(%r)' % (cls_name, self._value_)
14801471
else:
14811472
return "%s.%s" % (cls_name, self._name_)
1482-
# elif _is_single_bit(self._value_) or self._boundary_ is not FlagBoundary.KEEP:
1483-
# return '|'.join(['%s.%s' % (cls_name, name) for name in self._name_.split('|')])
1484-
# else:
1485-
# name = []
1486-
# for n in self._name_.split('|'):
1487-
# if n[0].isdigit():
1488-
# name.append(n)
1489-
# else:
1490-
# name.append('%s.%s' % (cls_name, n))
1491-
# return '|'.join(name)
14921473

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

1529-
# def __format__(self, format_spec):
1530-
# """
1531-
# Returns format using actual value unless __str__ has been overridden.
1532-
# """
1533-
# str_overridden = type(self).__str__ != Flag.__str__
1534-
# value = self
1535-
# if not str_overridden:
1536-
# value = self._value_
1537-
# return int.__format__(value, format_spec)
15381510

15391511
def __or__(self, other):
15401512
if isinstance(other, self.__class__):
@@ -1714,15 +1686,8 @@ def convert_class(cls):
17141686
# it
17151687
enum_class = type(cls_name, (etype, ), body, boundary=boundary, _simple=True)
17161688
for name in ('__repr__', '__str__', '__format__', '__reduce_ex__'):
1717-
# for name in ('__repr__', '__reduce_ex__'):
17181689
if name not in body:
17191690
setattr(enum_class, name, getattr(etype, name))
1720-
# continue
1721-
# class_method = getattr(enum_class, name)
1722-
# obj_method = getattr(member_type, name, None)
1723-
# enum_method = getattr(etype, name, None)
1724-
# if obj_method is not None and obj_method is class_method:
1725-
# setattr(enum_class, name, enum_method)
17261691
gnv_last_values = []
17271692
if issubclass(enum_class, Flag):
17281693
# Flag / IntFlag
@@ -1999,7 +1964,6 @@ def _test_simple_enum(checked_enum, simple_enum):
19991964
))
20001965
for method in (
20011966
'__str__', '__repr__', '__reduce_ex__', '__format__',
2002-
# '__repr__', '__reduce_ex__',
20031967
'__getnewargs_ex__', '__getnewargs__', '__reduce_ex__', '__reduce__'
20041968
):
20051969
if method in simple_keys and method in checked_keys:

Lib/test/test_enum.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1228,11 +1228,13 @@ class Color(Enum):
12281228
red = 1
12291229
green = 2
12301230
blue = 3
1231+
#
12311232
with self.assertRaises(TypeError):
12321233
class MoreColor(Color):
12331234
cyan = 4
12341235
magenta = 5
12351236
yellow = 6
1237+
#
12361238
with self.assertRaisesRegex(TypeError, "<enum .EvenMoreColor.> cannot extend <enum .Color.>"):
12371239
class EvenMoreColor(Color, IntEnum):
12381240
chartruese = 7

0 commit comments

Comments
 (0)