summaryrefslogtreecommitdiff
path: root/Lib/difflib.py
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-11-02 04:27:17 +0000
committerMartin Panter <vadmium+py@gmail.com>2015-11-02 04:27:17 +0000
commite56a9191000d2ff15d7550b9c852fa6dee9b8f50 (patch)
tree20b3d1d4f881f7c9e9b3549f79719497070b530a /Lib/difflib.py
parent9785261d68f62ce33968d15c7a0f10f1f8209807 (diff)
parentd2ad5718ad955a13cf570bacad1d7800d995da33 (diff)
downloadcpython-git-e56a9191000d2ff15d7550b9c852fa6dee9b8f50.tar.gz
Issue #25523: Merge a-to-an corrections from 3.5
Diffstat (limited to 'Lib/difflib.py')
-rw-r--r--Lib/difflib.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/difflib.py b/Lib/difflib.py
index 22d9145a07..076bbac01d 100644
--- a/Lib/difflib.py
+++ b/Lib/difflib.py
@@ -1515,7 +1515,7 @@ def _mdiff(fromlines, tolines, context=None, linejunk=None,
yield _make_line(lines,'-',0), None, True
continue
elif s.startswith(('--?+', '--+', '- ')):
- # in delete block and see a intraline change or unchanged line
+ # in delete block and see an intraline change or unchanged line
# coming: yield the delete line and then blanks
from_line,to_line = _make_line(lines,'-',0), None
num_blanks_to_yield,num_blanks_pending = num_blanks_pending-1,0