@@ -537,22 +537,23 @@ def gen(it):
537
537
range (0 ),
538
538
range (20 ),
539
539
[1 , 2 , 3 ],
540
- (1 , 2 , 3 ),
541
540
(2 ,),
542
541
set ((13 , 48 , 211 )),
543
542
frozenset ((15 , 8 , 6 )),
544
543
dict ([(1 , 2 ), (3 , 4 )]),
545
544
]
546
545
547
546
for seq in sequences :
548
- self .assertListEqual (list (get_generator_genexpr (iter (seq ))), list (seq ))
549
547
err_msg_genexpr = err_msg_pattern_genexpr % type (seq ).__name__
550
548
with self .assertRaisesRegex (TypeError , err_msg_genexpr ):
551
549
list (get_generator_genexpr (seq ))
550
+ self .assertListEqual (list (get_generator_genexpr (iter (seq ))),
551
+ list (seq ))
552
552
553
- for seq in sequences :
554
- self .assertListEqual (list (get_generator_fn_call (iter (seq ))), list (seq ))
555
- self .assertListEqual (list (get_generator_fn_call (seq )), list (seq ))
553
+ self .assertListEqual (list (get_generator_fn_call (seq )),
554
+ list (seq ))
555
+ self .assertListEqual (list (get_generator_fn_call (iter (seq ))),
556
+ list (seq ))
556
557
557
558
non_sequences = [
558
559
None ,
@@ -562,12 +563,12 @@ def gen(it):
562
563
]
563
564
564
565
for obj in non_sequences :
565
- err_msg_fn_call = err_msg_pattern_fn_call % type (obj ).__name__
566
- with self .assertRaisesRegex (TypeError , err_msg_fn_call ):
567
- list (get_generator_fn_call (obj ))
568
566
err_msg_genexpr = err_msg_pattern_genexpr % type (obj ).__name__
569
567
with self .assertRaisesRegex (TypeError , err_msg_genexpr ):
570
568
list (get_generator_genexpr (obj ))
569
+ err_msg_fn_call = err_msg_pattern_fn_call % type (obj ).__name__
570
+ with self .assertRaisesRegex (TypeError , err_msg_fn_call ):
571
+ list (get_generator_fn_call (obj ))
571
572
572
573
573
574
class FrameLocalsProxyMappingTests (mapping_tests .TestHashMappingProtocol ):
0 commit comments