@@ -182,7 +182,7 @@ def __new__(metacls, cls, bases, classdict):
182
182
)
183
183
# save enum items into separate mapping so they don't get baked into
184
184
# the new class
185
- members = dict (( k , classdict [k ]) for k in classdict ._member_names )
185
+ members = { k : classdict [k ] for k in classdict ._member_names }
186
186
for name in classdict ._member_names :
187
187
del classdict [name ]
188
188
@@ -209,15 +209,15 @@ def __new__(metacls, cls, bases, classdict):
209
209
_order_ += aliases
210
210
211
211
# check for illegal enum names (any others?)
212
- invalid_names = set (members ) & set ([ "mro" ])
212
+ invalid_names = set (members ) & { "mro" }
213
213
if invalid_names :
214
214
raise ValueError (
215
- "Invalid enum member name(s): %s" % (", " .join (invalid_names ), )
215
+ "Invalid enum member name(s): {}" . format (", " .join (invalid_names ))
216
216
)
217
217
218
218
# save attributes from super classes so we know if we can take
219
219
# the shortcut of storing members in the class dict
220
- base_attributes = set ([ a for b in bases for a in b .__dict__ ])
220
+ base_attributes = { a for b in bases for a in b .__dict__ }
221
221
# create our new Enum type
222
222
enum_class = super (EnumMeta , metacls ).__new__ (metacls , cls , bases , classdict )
223
223
enum_class ._member_names_ = [] # names in random order
@@ -686,23 +686,23 @@ def __new__(cls, value):
686
686
for member in cls ._member_map_ .values ():
687
687
if member .value == value :
688
688
return member
689
- raise ValueError ("%s is not a valid %s" % (value , cls .__name__ ))
689
+ raise ValueError ("{} is not a valid {}" . format (value , cls .__name__ ))
690
690
691
691
692
692
temp_enum_dict ["__new__" ] = __new__ # type: ignore
693
693
del __new__
694
694
695
695
696
696
def __repr__ (self ):
697
- return "<%s.%s: %r>" % (self .__class__ .__name__ , self ._name_ , self ._value_ )
697
+ return "<{}.{}: {!r}>" . format (self .__class__ .__name__ , self ._name_ , self ._value_ )
698
698
699
699
700
700
temp_enum_dict ["__repr__" ] = __repr__ # type: ignore
701
701
del __repr__
702
702
703
703
704
704
def __str__ (self ):
705
- return "%s.%s" % (self .__class__ .__name__ , self ._name_ )
705
+ return "{}.{}" . format (self .__class__ .__name__ , self ._name_ )
706
706
707
707
708
708
temp_enum_dict ["__str__" ] = __str__ # type: ignore
@@ -877,15 +877,15 @@ def _convert(cls, name, module, filter, source=None):
877
877
source = vars (source )
878
878
else :
879
879
source = module_globals
880
- members = dict (( name , value ) for name , value in source .items () if filter (name ))
880
+ members = { name : value for name , value in source .items () if filter (name )}
881
881
cls = cls (name , members , module = module )
882
882
cls .__reduce_ex__ = _reduce_ex_by_name
883
883
module_globals .update (cls .__members__ )
884
884
module_globals [name ] = cls
885
885
return cls
886
886
887
887
888
- temp_enum_dict ["_convert" ] = _convert # type: ignore
888
+ temp_enum_dict ["_convert" ] = _convert # type: ignore
889
889
del _convert
890
890
891
891
Enum = EnumMeta ("Enum" , (object ,), temp_enum_dict )
@@ -895,7 +895,7 @@ def _convert(cls, name, module, filter, source=None):
895
895
###########################
896
896
897
897
898
- class IntEnum (int , Enum ): # type: ignore
898
+ class IntEnum (int , Enum ): # type: ignore
899
899
"""Enum where members are also (and must be) ints"""
900
900
901
901
@@ -911,9 +911,9 @@ def unique(enumeration):
911
911
duplicates .append ((name , member .name ))
912
912
if duplicates :
913
913
duplicate_names = ", " .join (
914
- ["%s -> %s" % (alias , name ) for (alias , name ) in duplicates ]
914
+ ["{} -> {}" . format (alias , name ) for (alias , name ) in duplicates ]
915
915
)
916
916
raise ValueError (
917
- "duplicate names found in %r: %s" % (enumeration , duplicate_names )
917
+ "duplicate names found in {!r}: {}" . format (enumeration , duplicate_names )
918
918
)
919
919
return enumeration
0 commit comments