summaryrefslogtreecommitdiffstats
path: root/Lib/difflib.py
diff options
context:
space:
mode:
authorGiampaolo Rodola' <g.rodola@gmail.com>2014-06-22 10:44:05 (GMT)
committerGiampaolo Rodola' <g.rodola@gmail.com>2014-06-22 10:44:05 (GMT)
commitbc8197a287b151ac1f3b94a4308f34ba9a1633df (patch)
tree3674a5a2950b466415c6bbdeb4fe68046609174b /Lib/difflib.py
parent4f2eb81280e59325f4d3748b0a301ceb6af4af01 (diff)
parent47d1e2858eb26931fc76007d37204c379b3279bd (diff)
downloadcpython-bc8197a287b151ac1f3b94a4308f34ba9a1633df.zip
cpython-bc8197a287b151ac1f3b94a4308f34ba9a1633df.tar.gz
cpython-bc8197a287b151ac1f3b94a4308f34ba9a1633df.tar.bz2
merge heads
Diffstat (limited to 'Lib/difflib.py')
-rw-r--r--Lib/difflib.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/difflib.py b/Lib/difflib.py
index 48d7e57..4af88a9 100644
--- a/Lib/difflib.py
+++ b/Lib/difflib.py
@@ -511,8 +511,8 @@ class SequenceMatcher:
non_adjacent.append((i1, j1, k1))
non_adjacent.append( (la, lb, 0) )
- self.matching_blocks = non_adjacent
- return map(Match._make, self.matching_blocks)
+ self.matching_blocks = list(map(Match._make, non_adjacent))
+ return self.matching_blocks
def get_opcodes(self):
"""Return list of 5-tuples describing how to turn a into b.