@@ -40,16 +40,14 @@ def __init__(self, *args, **kwargs):
4040 self .underlying_transform = mtrans .Affine2D ().scale (10 , 10 )
4141
4242 def transform_path_non_affine (self , path ):
43- if self .raise_on_transform :
44- assert False , ('Invalidated affine part of transform '
45- 'unnecessarily.' )
43+ assert not self .raise_on_transform , \
44+ 'Invalidated affine part of transform unnecessarily.'
4645 return self .underlying_transform .transform_path (path )
4746 transform_path = transform_path_non_affine
4847
4948 def transform_non_affine (self , path ):
50- if self .raise_on_transform :
51- assert False , ('Invalidated affine part of transform '
52- 'unnecessarily.' )
49+ assert not self .raise_on_transform , \
50+ 'Invalidated affine part of transform unnecessarily.'
5351 return self .underlying_transform .transform (path )
5452 transform = transform_non_affine
5553
@@ -277,14 +275,14 @@ def test_left_to_right_iteration(self):
277275 self .ta3 ,
278276 ]
279277 r = [rh for _ , rh in stack3 ._iter_break_from_left_to_right ()]
280- self . assertEqual ( len (r ), len (target_transforms ) )
278+ assert len (r ) == len (target_transforms )
281279
282280 for target_stack , stack in zip (target_transforms , r ):
283- self . assertEqual ( target_stack , stack )
281+ assert target_stack == stack
284282
285283 def test_transform_shortcuts (self ):
286- self .assertEqual ( self . stack1 - self .stack2_subset , self .ta1 )
287- self .assertEqual ( self . stack2 - self .stack2_subset , self .ta1 )
284+ assert self .stack1 - self .stack2_subset == self .ta1
285+ assert self .stack2 - self .stack2_subset == self .ta1
288286
289287 assert self .stack2_subset - self .stack2 == self .ta1 .inverted ()
290288 assert (self .stack2_subset - self .stack2 ).depth == 1
@@ -295,42 +293,40 @@ def test_transform_shortcuts(self):
295293 aff1 = self .ta1 + (self .ta2 + self .ta3 )
296294 aff2 = self .ta2 + self .ta3
297295
298- self . assertEqual ( aff1 - aff2 , self .ta1 )
299- self . assertEqual ( aff1 - self .ta2 , aff1 + self .ta2 .inverted () )
296+ assert aff1 - aff2 == self .ta1
297+ assert aff1 - self .ta2 == aff1 + self .ta2 .inverted ()
300298
301- self .assertEqual (self .stack1 - self .ta3 ,
302- self .ta1 + (self .tn1 + self .ta2 ))
303- self .assertEqual (self .stack2 - self .ta3 ,
304- self .ta1 + self .tn1 + self .ta2 )
299+ assert self .stack1 - self .ta3 == self .ta1 + (self .tn1 + self .ta2 )
300+ assert self .stack2 - self .ta3 == self .ta1 + self .tn1 + self .ta2
305301
306- self . assertEqual ((self .ta2 + self .ta3 ) - self .ta3 + self .ta3 ,
307- self .ta2 + self .ta3 )
302+ assert ((self .ta2 + self .ta3 ) - self .ta3 + self .ta3 ==
303+ self .ta2 + self .ta3 )
308304
309305 def test_contains_branch (self ):
310306 r1 = (self .ta2 + self .ta1 )
311307 r2 = (self .ta2 + self .ta1 )
312- self . assertEqual ( r1 , r2 )
313- self . assertNotEqual ( r1 , self .ta1 )
314- self . assertTrue ( r1 .contains_branch (r2 ) )
315- self . assertTrue ( r1 .contains_branch (self .ta1 ) )
316- self . assertFalse ( r1 .contains_branch (self .ta2 ) )
317- self . assertFalse ( r1 .contains_branch ((self .ta2 + self .ta2 ) ))
308+ assert r1 == r2
309+ assert r1 != self .ta1
310+ assert r1 .contains_branch (r2 )
311+ assert r1 .contains_branch (self .ta1 )
312+ assert not r1 .contains_branch (self .ta2 )
313+ assert not r1 .contains_branch ((self .ta2 + self .ta2 ))
318314
319- self . assertEqual ( r1 , r2 )
315+ assert r1 == r2
320316
321- self .assertTrue ( self . stack1 .contains_branch (self .ta3 ) )
322- self .assertTrue ( self . stack2 .contains_branch (self .ta3 ) )
317+ assert self .stack1 .contains_branch (self .ta3 )
318+ assert self .stack2 .contains_branch (self .ta3 )
323319
324- self .assertTrue ( self . stack1 .contains_branch (self .stack2_subset ) )
325- self .assertTrue ( self . stack2 .contains_branch (self .stack2_subset ) )
320+ assert self .stack1 .contains_branch (self .stack2_subset )
321+ assert self .stack2 .contains_branch (self .stack2_subset )
326322
327- self .assertFalse ( self . stack2_subset .contains_branch (self .stack1 ) )
328- self .assertFalse ( self . stack2_subset .contains_branch (self .stack2 ) )
323+ assert not self .stack2_subset .contains_branch (self .stack1 )
324+ assert not self .stack2_subset .contains_branch (self .stack2 )
329325
330- self .assertTrue ( self . stack1 .contains_branch ((self .ta2 + self .ta3 ) ))
331- self .assertTrue ( self . stack2 .contains_branch ((self .ta2 + self .ta3 ) ))
326+ assert self .stack1 .contains_branch ((self .ta2 + self .ta3 ))
327+ assert self .stack2 .contains_branch ((self .ta2 + self .ta3 ))
332328
333- self .assertFalse ( self . stack1 .contains_branch ((self .tn1 + self .ta2 ) ))
329+ assert not self .stack1 .contains_branch ((self .tn1 + self .ta2 ))
334330
335331 def test_affine_simplification (self ):
336332 # tests that a transform stack only calls as much is absolutely
0 commit comments