8000 GH-98363: Fix exception handling in batched() by rhettinger · Pull Request #98523 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

GH-98363: Fix exception handling in batched() #98523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 21, 2022
Merged

GH-98363: Fix exception handling in batched() #98523

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ccbb402
Add failing test for unhandled iterator expection
rhettinger Oct 21, 2022
9343e27
Fix failing test.
rhettinger Oct 21, 2022
9d8cf66
Refactor so that the logic is more clear
rhettinger Oct 21, 2022
699bdf6
Loop invariant code motion: hoist the slot lookup out of the loop.
rhettinger Oct 21, 2022
4b74a0b
Loop invariant code motion: hoist ob_item lookup out of the loop.
rhettinger Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add failing test for unhandled iterator expection
  • Loading branch information
@rhettinger
rhettinger committed Oct 21, 2022
commit ccbb4021b4543850a342f5b032ee8be0e7970e93
15 changes: 15 additions & 0 deletions Lib/test/test_itertools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2012,6 +2012,20 @@ def __iter__(self):
def __next__(self):
3 // 0

class E2:
'Test propagation of exceptions after two iterations'
def __init__(self, seqn):
self.seqn = seqn
self.i = 0
def __iter__(self):
return self
def __next__(self):
if self.i == 2:
raise ZeroDivisionError
v = self.seqn[self.i]
self.i += 1
return v

class S:
'Test immediate stop'
def __init__(self, seqn):
Expand Down Expand Up @@ -2050,6 +2064,7 @@ def test_batched(self):
self.assertRaises(TypeError, batched, X(s), 2)
self.assertRaises(TypeError, batched, N(s), 2)
self.assertRaises(ZeroDivisionError, list, batched(E(s), 2))
self.assertRaises(ZeroDivisionError, list, batched(E2(s), 4))

def test_chain(self):
for s in ("123", "", range(1000), ('do', 1.2), range(2000,2200,5)):
Expand Down
0