@@ -182,7 +182,7 @@ def __new__(metacls, cls, bases, classdict):
182182 )
183183 # save enum items into separate mapping so they don't get baked into
184184 # 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 }
186186 for name in classdict ._member_names :
187187 del classdict [name ]
188188
@@ -209,15 +209,15 @@ def __new__(metacls, cls, bases, classdict):
209209 _order_ += aliases
210210
211211 # check for illegal enum names (any others?)
212- invalid_names = set (members ) & set ([ "mro" ])
212+ invalid_names = set (members ) & { "mro" }
213213 if invalid_names :
214214 raise ValueError (
215- "Invalid enum member name(s): %s" % (", " .join (invalid_names ), )
215+ "Invalid enum member name(s): {}" . format (", " .join (invalid_names ))
216216 )
217217
218218 # save attributes from super classes so we know if we can take
219219 # 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__ }
221221 # create our new Enum type
222222 enum_class = super (EnumMeta , metacls ).__new__ (metacls , cls , bases , classdict )
223223 enum_class ._member_names_ = [] # names in random order
@@ -686,23 +686,23 @@ def __new__(cls, value):
686686 for member in cls ._member_map_ .values ():
687687 if member .value == value :
688688 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__ ))
690690
691691
692692temp_enum_dict ["__new__" ] = __new__ # type: ignore
693693del __new__
694694
695695
696696def __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_ )
698698
699699
700700temp_enum_dict ["__repr__" ] = __repr__ # type: ignore
701701del __repr__
702702
703703
704704def __str__ (self ):
705- return "%s.%s" % (self .__class__ .__name__ , self ._name_ )
705+ return "{}.{}" . format (self .__class__ .__name__ , self ._name_ )
706706
707707
708708temp_enum_dict ["__str__" ] = __str__ # type: ignore
@@ -877,15 +877,15 @@ def _convert(cls, name, module, filter, source=None):
877877 source = vars (source )
878878 else :
879879 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 )}
881881 cls = cls (name , members , module = module )
882882 cls .__reduce_ex__ = _reduce_ex_by_name
883883 module_globals .update (cls .__members__ )
884884 module_globals [name ] = cls
885885 return cls
886886
887887
888- temp_enum_dict ["_convert" ] = _convert # type: ignore
888+ temp_enum_dict ["_convert" ] = _convert # type: ignore
889889del _convert
890890
891891Enum = EnumMeta ("Enum" , (object ,), temp_enum_dict )
@@ -895,7 +895,7 @@ def _convert(cls, name, module, filter, source=None):
895895###########################
896896
897897
898- class IntEnum (int , Enum ): # type: ignore
898+ class IntEnum (int , Enum ): # type: ignore
899899 """Enum where members are also (and must be) ints"""
900900
901901
@@ -911,9 +911,9 @@ def unique(enumeration):
911911 duplicates .append ((name , member .name ))
912912 if duplicates :
913913 duplicate_names = ", " .join (
914- ["%s -> %s" % (alias , name ) for (alias , name ) in duplicates ]
914+ ["{} -> {}" . format (alias , name ) for (alias , name ) in duplicates ]
915915 )
916916 raise ValueError (
917- "duplicate names found in %r: %s" % (enumeration , duplicate_names )
917+ "duplicate names found in {!r}: {}" . format (enumeration , duplicate_names )
918918 )
919919 return enumeration
0 commit comments