mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 17:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

#18705: merge with 3.3.

Browse source
This commit is contained in:
Ezio Melotti 2013-08-17 15:53:55 +03:00
commit 9a3777e525
26 changed files with 49 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/difflib.py
View file

@ -575,7 +575,7 @@ class SequenceMatcher:
def get_grouped_opcodes(self, n=3):
""" Isolate change clusters by eliminating ranges with no changes.
Return a generator of groups with upto n lines of context.
Return a generator of groups with up to n lines of context.
Each group is in the same format as returned by get_opcodes().
>>> from pprint import pprint
@ -1344,7 +1344,7 @@ def _mdiff(fromlines, tolines, context=None, linejunk=None,
linejunk -- passed on to ndiff (see ndiff documentation)
charjunk -- passed on to ndiff (see ndiff documentation)
This function returns an interator which returns a tuple:
This function returns an iterator which returns a tuple:
(from line tuple, to line tuple, boolean flag)
from/to line tuple -- (line num, line text)
@ -1946,7 +1946,7 @@ class HtmlDiff(object):
self._make_prefix()
# change tabs to spaces before it gets more difficult after we insert
# markkup
# markup
fromlines,tolines = self._tab_newline_replace(fromlines,tolines)
# create diffs iterator which generates side by side from/to data