@@ -541,15 +541,6 @@ def __new__(metacls, cls, bases, classdict, *, boundary=None, _simple=False, **k
541
541
cls_name , member .name , member .value ,
542
542
cls_name , member2 .name , member2 .value ,
543
543
)
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
- # )
553
544
else :
554
545
member2 = list (enum_class )[1 ]
555
546
member3 = list (enum_class )[2 ]
@@ -1479,16 +1470,6 @@ def __str__(self):
1479
1470
return '%s(%r)' % (cls_name , self ._value_ )
1480
1471
else :
1481
1472
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)
1492
1473
1493
1474
def __bool__ (self ):
1494
1475
return bool (self ._value_ )
@@ -1526,15 +1507,6 @@ class IntFlag(int, ReprEnum, Flag, boundary=EJECT):
1526
1507
Support for integer-based Flags
1527
1508
"""
1528
1509
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)
1538
1510
1539
1511
def __or__ (self , other ):
1540
1512
if isinstance (other , self .__class__ ):
@@ -1714,15 +1686,8 @@ def convert_class(cls):
1714
1686
# it
1715
1687
enum_class = type (cls_name , (etype , ), body , boundary = boundary , _simple = True )
1716
1688
for name in ('__repr__' , '__str__' , '__format__' , '__reduce_ex__' ):
1717
- # for name in ('__repr__', '__reduce_ex__'):
1718
1689
if name not in body :
1719
1690
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)
1726
1691
gnv_last_values = []
1727
1692
if issubclass (enum_class , Flag ):
1728
1693
# Flag / IntFlag
@@ -1999,7 +1964,6 @@ def _test_simple_enum(checked_enum, simple_enum):
1999
1964
))
2000
1965
for method in (
2001
1966
'__str__' , '__repr__' , '__reduce_ex__' , '__format__' ,
2002
- # '__repr__', '__reduce_ex__',
2003
1967
'__getnewargs_ex__' , '__getnewargs__' , '__reduce_ex__' , '__reduce__'
2004
1968
):
2005
1969
if method in simple_keys and method in checked_keys :
0 commit comments