From 8da15f09458fd4f4fe341861e41723892b25a11b Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Thu, 5 Apr 2018 12:18:02 -0700 Subject: bpo-33224: PEP 479 fix for difflib.mdiff() (GH-6381) (GH-6391) (cherry picked from commit 01b731fc2b04744a11e32f93aba8bfb9ddb3dd29) Co-authored-by: Raymond Hettinger --- Lib/difflib.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'Lib/difflib.py') diff --git a/Lib/difflib.py b/Lib/difflib.py index 72971d5b87..7cebd64978 100644 --- a/Lib/difflib.py +++ b/Lib/difflib.py @@ -1634,14 +1634,18 @@ def _mdiff(fromlines, tolines, context=None, linejunk=None, lines_to_write -= 1 # Now yield the context lines after the change lines_to_write = context-1 - while(lines_to_write): - from_line, to_line, found_diff = next(line_pair_iterator) - # If another change within the context, extend the context - if found_diff: - lines_to_write = context-1 - else: - lines_to_write -= 1 - yield from_line, to_line, found_diff + try: + while(lines_to_write): + from_line, to_line, found_diff = next(line_pair_iterator) + # If another change within the context, extend the context + if found_diff: + lines_to_write = context-1 + else: + lines_to_write -= 1 + yield from_line, to_line, found_diff + except StopIteration: + # Catch exception from next() and return normally + return _file_template = """ -- cgit v1.2.1