mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-06 07:02:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-33224: PEP 479 fix for difflib.mdiff() (GH-6381) (GH-6390)

Browse source
This commit is contained in:
Miss Islington (bot) 2018-04-05 11:45:33 -07:00 • committed by Raymond Hettinger
parent baf304e82e
commit 28c179094b
3 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Lib/difflib.py
View file

@ -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 = """