[pylint 'consider-using-enumerate'] Use zip when iterating on two iterators

This commit is contained in:
Pierre Sassoulas 2024-03-31 23:54:29 +02:00
parent a194e5ed27
commit 9c0ec41983
3 changed files with 8 additions and 11 deletions

View File

@ -187,7 +187,6 @@ disable = [
"comparison-with-itself", "comparison-with-itself",
"condition-evals-to-constant", "condition-evals-to-constant",
"consider-using-dict-items", "consider-using-dict-items",
"consider-using-enumerate",
"consider-using-from-import", "consider-using-from-import",
"consider-using-f-string", "consider-using-f-string",
"consider-using-in", "consider-using-in",

View File

@ -100,14 +100,13 @@ class TestReportSerialization:
rep_entries = rep.longrepr.reprtraceback.reprentries rep_entries = rep.longrepr.reprtraceback.reprentries
a_entries = a.longrepr.reprtraceback.reprentries a_entries = a.longrepr.reprtraceback.reprentries
for i in range(len(a_entries)): assert len(rep_entries) == len(a_entries) # python < 3.10 zip(strict=True)
rep_entry = rep_entries[i] for a_entry, rep_entry in zip(a_entries, rep_entries):
assert isinstance(rep_entry, ReprEntry) assert isinstance(rep_entry, ReprEntry)
assert rep_entry.reprfileloc is not None assert rep_entry.reprfileloc is not None
assert rep_entry.reprfuncargs is not None assert rep_entry.reprfuncargs is not None
assert rep_entry.reprlocals is not None assert rep_entry.reprlocals is not None
a_entry = a_entries[i]
assert isinstance(a_entry, ReprEntry) assert isinstance(a_entry, ReprEntry)
assert a_entry.reprfileloc is not None assert a_entry.reprfileloc is not None
assert a_entry.reprfuncargs is not None assert a_entry.reprfuncargs is not None
@ -146,9 +145,10 @@ class TestReportSerialization:
rep_entries = rep.longrepr.reprtraceback.reprentries rep_entries = rep.longrepr.reprtraceback.reprentries
a_entries = a.longrepr.reprtraceback.reprentries a_entries = a.longrepr.reprtraceback.reprentries
for i in range(len(a_entries)): assert len(rep_entries) == len(a_entries) # python < 3.10 zip(strict=True)
assert isinstance(rep_entries[i], ReprEntryNative) for rep_entry, a_entry in zip(rep_entries, a_entries):
assert rep_entries[i].lines == a_entries[i].lines assert isinstance(rep_entry, ReprEntryNative)
assert rep_entry.lines == a_entry.lines
def test_itemreport_outcomes(self, pytester: Pytester) -> None: def test_itemreport_outcomes(self, pytester: Pytester) -> None:
# This test came originally from test_remote.py in xdist (ca03269). # This test came originally from test_remote.py in xdist (ca03269).

View File

@ -280,10 +280,8 @@ def test_warning_recorded_hook(pytester: Pytester) -> None:
("call warning", "runtest", "test_warning_recorded_hook.py::test_func"), ("call warning", "runtest", "test_warning_recorded_hook.py::test_func"),
("teardown warning", "runtest", "test_warning_recorded_hook.py::test_func"), ("teardown warning", "runtest", "test_warning_recorded_hook.py::test_func"),
] ]
for index in range(len(expected)): assert len(collected) == len(expected) # python < 3.10 zip(strict=True)
collected_result = collected[index] for collected_result, expected_result in zip(collected, expected):
expected_result = expected[index]
assert collected_result[0] == expected_result[0], str(collected) assert collected_result[0] == expected_result[0], str(collected)
assert collected_result[1] == expected_result[1], str(collected) assert collected_result[1] == expected_result[1], str(collected)
assert collected_result[2] == expected_result[2], str(collected) assert collected_result[2] == expected_result[2], str(collected)