@@ -208,7 +208,7 @@ def __new__(metacls, cls, bases, classdict):
208
208
invalid_names = set (members ) & {"mro" }
209
209
if invalid_names :
210
210
raise ValueError (
211
- "Invalid enum member name(s): %s" % (", " .join (invalid_names ), )
211
+ "Invalid enum member name(s): {}" . format (", " .join (invalid_names ))
212
212
)
213
213
214
214
# save attributes from super classes so we know if we can take
@@ -682,23 +682,23 @@ def __new__(cls, value):
682
682
for member in cls ._member_map_ .values ():
683
683
if member .value == value :
684
684
return member
685
- raise ValueError ("%s is not a valid %s" % (value , cls .__name__ ))
685
+ raise ValueError ("{} is not a valid {}" . format (value , cls .__name__ ))
686
686
687
687
688
688
temp_enum_dict ["__new__" ] = __new__
689
689
del __new__
690
690
691
691
692
692
def __repr__ (self ):
693
- return "<%s.%s: %r>" % (self .__class__ .__name__ , self ._name_ , self ._value_ )
693
+ return "<{}.{}: {!r}>" . format (self .__class__ .__name__ , self ._name_ , self ._value_ )
694
694
695
695
696
696
temp_enum_dict ["__repr__" ] = __repr__
697
697
del __repr__
698
698
699
699
700
700
def __str__ (self ):
701
- return "%s.%s" % (self .__class__ .__name__ , self ._name_ )
701
+ return "{}.{}" . format (self .__class__ .__name__ , self ._name_ )
702
702
703
703
704
704
temp_enum_dict ["__str__" ] = __str__
@@ -907,9 +907,9 @@ def unique(enumeration):
907
907
duplicates .append ((name , member .name ))
908
908
if duplicates :
909
909
duplicate_names = ", " .join (
910
- ["%s -> %s" % (alias , name ) for (alias , name ) in duplicates ]
910
+ ["{} -> {}" . format (alias , name ) for (alias , name ) in duplicates ]
911
911
)
912
912
raise ValueError (
913
- "duplicate names found in %r: %s" % (enumeration , duplicate_names )
913
+ "duplicate names found in {!r}: {}" . format (enumeration , duplicate_names )
914
914
)
915
915
return enumeration
0 commit comments