Skip to content

Commit 8da7ac6

Browse files
pythongh-125038: Little change in test, readability slightly improved
1 parent 2c98a00 commit 8da7ac6

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

Lib/test/test_frame.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -537,22 +537,23 @@ def gen(it):
537537
range(0),
538538
range(20),
539539
[1, 2, 3],
540-
(1, 2, 3),
541540
(2,),
542541
set((13, 48, 211)),
543542
frozenset((15, 8, 6)),
544543
dict([(1, 2), (3, 4)]),
545544
]
546545

547546
for seq in sequences:
548-
self.assertListEqual(list(get_generator_genexpr(iter(seq))), list(seq))
549547
err_msg_genexpr = err_msg_pattern_genexpr % type(seq).__name__
550548
with self.assertRaisesRegex(TypeError, err_msg_genexpr):
551549
list(get_generator_genexpr(seq))
550+
self.assertListEqual(list(get_generator_genexpr(iter(seq))),
551+
list(seq))
552552

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))
556557

557558
non_sequences = [
558559
None,
@@ -562,12 +563,12 @@ def gen(it):
562563
]
563564

564565
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))
568566
err_msg_genexpr = err_msg_pattern_genexpr % type(obj).__name__
569567
with self.assertRaisesRegex(TypeError, err_msg_genexpr):
570568
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))
571572

572573

573574
class FrameLocalsProxyMappingTests(mapping_tests.TestHashMappingProtocol):

0 commit comments

Comments
 (0)