summaryrefslogtreecommitdiffstats
path: root/Lib/difflib.py
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-11-02 04:04:57 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2015-11-02 04:04:57 (GMT)
commit2eb819f7a82c7eb61f2d253894d9973f0ec21df2 (patch)
treec881e371e6ae948cbd725afd91fa8f5b0c6c940f /Lib/difflib.py
parent56275dc1e2a2f354620189efd751fa90af2118e1 (diff)
parent7462b64911f1e2df2de2285ddbf8b156b5cdc418 (diff)
downloadcpython-2eb819f7a82c7eb61f2d253894d9973f0ec21df2.zip
cpython-2eb819f7a82c7eb61f2d253894d9973f0ec21df2.tar.gz
cpython-2eb819f7a82c7eb61f2d253894d9973f0ec21df2.tar.bz2
Issue #25523: Merge "a" to "an" fixes from 3.4 into 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 22d9145..076bbac 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