@@ -89,7 +89,7 @@ def checkBooleanParam(self, widget, name):
89
89
self .checkParam (widget , name , value , expected = 0 )
90
90
for value in (True , 1 , 'true' , 'yes' , 'on' ):
91
91
self .checkParam (widget , name , value , expected = 1 )
92
- errmsg = 'expected boolean value but got "{}"'
92
+ errmsg = 'expected boolean value but got "{}"'
93
93
self .checkInvalidParam (widget , name , '' , errmsg = errmsg )
94
94
self .checkInvalidParam (widget , name , 'spam' , errmsg = errmsg )
95
95
@@ -148,13 +148,13 @@ def checkPixelsParam(self, widget, name, *values,
148
148
self .checkInvalidParam (widget , name , 'spam' , errmsg = errmsg )
149
149
150
150
def checkReliefParam (self , widget , name , * , allow_empty = False ):
151
- options = ['flat' , 'groove' , 'raised' , 'ridge' , 'solid' , 'sunken' ]
151
+ values = ['flat' , 'groove' , 'raised' , 'ridge' , 'solid' , 'sunken' ]
152
152
if allow_empty :
153
- options .append ('' )
154
- self .checkParams (widget , name , * options )
155
- lastop = options . pop ()
156
- opstring = ', ' .join (options )
157
- errmsg = f'bad relief "spam": must be { opstring } , or { lastop or '""' } '
153
+ values .append ('' )
154
+ self .checkParams (widget , name , * values )
155
+ errmsg = 'bad relief "{}": must be %s, or %s' % (
156
+ ', ' .join (values [: - 1 ]),
157
+ values [ - 1 ] or '""' )
158
158
if tk_version < (8 , 6 ):
159
159
errmsg = None
160
160
self .checkInvalidParam (widget , name , 'spam' , errmsg = errmsg )
0 commit comments