@@ -32,8 +32,7 @@ def __init__(self, *args, **kw):
3232 self ._error = kw .get ('error' )
3333
3434 def __repr__ (self ):
35- return '%s(%s)' % (self .__class__ .__name__ ,
36- ', ' .join (repr (a ) for a in self ._args ))
35+ return f"{ self .__class__ .__name__ } ({ ', ' .join (repr (a ) for a in self ._args )} )"
3736
3837 def validate (self , data ):
3938 for s in [Schema (s , error = self ._error ) for s in self ._args ]:
@@ -50,7 +49,7 @@ def validate(self, data):
5049 return s .validate (data )
5150 except SchemaError as _x :
5251 x = _x
53- raise SchemaError (['%r did not validate %r' % ( self , data ) ] + x .autos ,
52+ raise SchemaError ([f' { self !r } did not validate { data !r } ' ] + x .autos ,
5453 [self ._error ] + x .errors )
5554
5655
@@ -62,7 +61,7 @@ def __init__(self, callable_, error=None):
6261 self ._error = error
6362
6463 def __repr__ (self ):
65- return '%s(%r)' % ( self .__class__ .__name__ , self ._callable )
64+ return f' { self .__class__ .__name__ } ( { self ._callable !r } )'
6665
6766 def validate (self , data ):
6867 try :
@@ -71,7 +70,7 @@ def validate(self, data):
7170 raise SchemaError ([None ] + x .autos , [self ._error ] + x .errors )
7271 except BaseException as x :
7372 f = self ._callable .__name__
74- raise SchemaError ('%s(%r ) raised %r' % ( f , data , x ) , self ._error )
73+ raise SchemaError (f' { f } ( { data !r } ) raised { x !r } ' , self ._error )
7574
7675
7776def priority (s ):
@@ -103,7 +102,7 @@ def __init__(self, schema, error=None):
103102 self ._error = error
104103
105104 def __repr__ (self ):
106- return '%s(%r)' % ( self .__class__ .__name__ , self ._schema )
105+ return f' { self .__class__ .__name__ } ( { self ._schema !r } )'
107106
108107 def validate (self , data ):
109108 s = self ._schema
@@ -141,30 +140,29 @@ def validate(self, data):
141140 new [nkey ] = nvalue
142141 elif skey is not None :
143142 if x is not None :
144- raise SchemaError (['key %r is required' % key ] +
143+ raise SchemaError ([f 'key { key !r } is required' ] +
145144 x .autos , [e ] + x .errors )
146145 else :
147- raise SchemaError ('key %r is required' % skey , e )
146+ raise SchemaError (f 'key { skey !r } is required' , e )
148147 coverage = set (k for k in coverage if type (k ) is not Optional )
149148 required = set (k for k in s if type (k ) is not Optional )
150149 if coverage != required :
151- raise SchemaError ('missed keys %r' % (required - coverage ), e )
150+ raise SchemaError (f 'missed keys { (required - coverage )!r } ' , e )
152151 if len (new ) != len (data ):
153- raise SchemaError ('wrong keys %r in %r' % ( new , data ) , e )
152+ raise SchemaError (f 'wrong keys { new !r } in { data !r } ' , e )
154153 return new
155154 if hasattr (s , 'validate' ):
156155 try :
157156 return s .validate (data )
158157 except SchemaError as x :
159158 raise SchemaError ([None ] + x .autos , [e ] + x .errors )
160159 except BaseException as x :
161- raise SchemaError ('%r.validate(%r) raised %r' % (s , data , x ),
162- self ._error )
160+ raise SchemaError (f'{ s !r} .validate({ data !r} ) raised { x !r} ' , self ._error )
163161 if type (s ) is type :
164162 if isinstance (data , s ):
165163 return data
166164 else :
167- raise SchemaError ('%r should be instance of %r' % ( data , s ) , e )
165+ raise SchemaError (f' { data !r } should be instance of { s !r } ' , e )
168166 if callable (s ):
169167 f = s .__name__
170168 try :
@@ -173,13 +171,12 @@ def validate(self, data):
173171 except SchemaError as x :
174172 raise SchemaError ([None ] + x .autos , [e ] + x .errors )
175173 except BaseException as x :
176- raise SchemaError ('%s(%r) raised %r' % (f , data , x ),
177- self ._error )
178- raise SchemaError ('%s(%r) should evaluate to True' % (f , data ), e )
174+ raise SchemaError (f'{ f } ({ data !r} ) raised { x !r} ' , self ._error )
175+ raise SchemaError (f'{ f } ({ data !r} ) should evaluate to True' , e )
179176 if s == data :
180177 return data
181178 else :
182- raise SchemaError ('%r does not match %r' % ( s , data ) , e )
179+ raise SchemaError (f' { s !r } does not match { data !r } ' , e )
183180
184181
185182class Optional (Schema ):
0 commit comments