blob: f1c4444fa08f174244560aa0bd22cdf86d26b0bc [file] [log] [blame]
Tim Peters9ae21482001-02-10 08:00:53 +00001#! /usr/bin/env python
2
3"""
4Module difflib -- helpers for computing deltas between objects.
5
6Function get_close_matches(word, possibilities, n=3, cutoff=0.6):
Tim Peters9ae21482001-02-10 08:00:53 +00007 Use SequenceMatcher to return list of the best "good enough" matches.
8
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00009Function context_diff(a, b):
10 For two lists of strings, return a delta in context diff format.
11
Tim Peters5e824c32001-08-12 22:25:01 +000012Function ndiff(a, b):
13 Return a delta: the difference between `a` and `b` (lists of strings).
Tim Peters9ae21482001-02-10 08:00:53 +000014
Tim Peters5e824c32001-08-12 22:25:01 +000015Function restore(delta, which):
16 Return one of the two sequences that generated an ndiff delta.
Tim Peters9ae21482001-02-10 08:00:53 +000017
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +000018Function unified_diff(a, b):
19 For two lists of strings, return a delta in unified diff format.
20
Tim Peters5e824c32001-08-12 22:25:01 +000021Class SequenceMatcher:
22 A flexible class for comparing pairs of sequences of any type.
Tim Peters9ae21482001-02-10 08:00:53 +000023
Tim Peters5e824c32001-08-12 22:25:01 +000024Class Differ:
25 For producing human-readable deltas from sequences of lines of text.
Martin v. Löwise064b412004-08-29 16:34:40 +000026
27Class HtmlDiff:
28 For producing HTML side by side comparison with change highlights.
Tim Peters9ae21482001-02-10 08:00:53 +000029"""
30
Tim Peters5e824c32001-08-12 22:25:01 +000031__all__ = ['get_close_matches', 'ndiff', 'restore', 'SequenceMatcher',
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +000032 'Differ','IS_CHARACTER_JUNK', 'IS_LINE_JUNK', 'context_diff',
Raymond Hettinger0ff4daf2008-01-11 03:20:54 +000033 'unified_diff', 'HtmlDiff', 'Match']
Tim Peters5e824c32001-08-12 22:25:01 +000034
Raymond Hettingerbb6b7342004-06-13 09:57:33 +000035import heapq
Raymond Hettinger0ff4daf2008-01-11 03:20:54 +000036from collections import namedtuple as _namedtuple
37
38Match = _namedtuple('Match', 'a b size')
Raymond Hettingerbb6b7342004-06-13 09:57:33 +000039
Neal Norwitze7dfe212003-07-01 14:59:46 +000040def _calculate_ratio(matches, length):
41 if length:
42 return 2.0 * matches / length
43 return 1.0
44
Tim Peters9ae21482001-02-10 08:00:53 +000045class SequenceMatcher:
Tim Peters5e824c32001-08-12 22:25:01 +000046
47 """
48 SequenceMatcher is a flexible class for comparing pairs of sequences of
49 any type, so long as the sequence elements are hashable. The basic
50 algorithm predates, and is a little fancier than, an algorithm
51 published in the late 1980's by Ratcliff and Obershelp under the
52 hyperbolic name "gestalt pattern matching". The basic idea is to find
53 the longest contiguous matching subsequence that contains no "junk"
54 elements (R-O doesn't address junk). The same idea is then applied
55 recursively to the pieces of the sequences to the left and to the right
56 of the matching subsequence. This does not yield minimal edit
57 sequences, but does tend to yield matches that "look right" to people.
58
59 SequenceMatcher tries to compute a "human-friendly diff" between two
60 sequences. Unlike e.g. UNIX(tm) diff, the fundamental notion is the
61 longest *contiguous* & junk-free matching subsequence. That's what
62 catches peoples' eyes. The Windows(tm) windiff has another interesting
63 notion, pairing up elements that appear uniquely in each sequence.
64 That, and the method here, appear to yield more intuitive difference
65 reports than does diff. This method appears to be the least vulnerable
66 to synching up on blocks of "junk lines", though (like blank lines in
67 ordinary text files, or maybe "<P>" lines in HTML files). That may be
68 because this is the only method of the 3 that has a *concept* of
69 "junk" <wink>.
70
71 Example, comparing two strings, and considering blanks to be "junk":
72
73 >>> s = SequenceMatcher(lambda x: x == " ",
74 ... "private Thread currentThread;",
75 ... "private volatile Thread currentThread;")
76 >>>
77
78 .ratio() returns a float in [0, 1], measuring the "similarity" of the
79 sequences. As a rule of thumb, a .ratio() value over 0.6 means the
80 sequences are close matches:
81
82 >>> print round(s.ratio(), 3)
83 0.866
84 >>>
85
86 If you're only interested in where the sequences match,
87 .get_matching_blocks() is handy:
88
89 >>> for block in s.get_matching_blocks():
90 ... print "a[%d] and b[%d] match for %d elements" % block
91 a[0] and b[0] match for 8 elements
Tim Peters43898b42006-06-14 04:09:25 +000092 a[8] and b[17] match for 21 elements
Tim Peters5e824c32001-08-12 22:25:01 +000093 a[29] and b[38] match for 0 elements
94
95 Note that the last tuple returned by .get_matching_blocks() is always a
96 dummy, (len(a), len(b), 0), and this is the only case in which the last
97 tuple element (number of elements matched) is 0.
98
99 If you want to know how to change the first sequence into the second,
100 use .get_opcodes():
101
102 >>> for opcode in s.get_opcodes():
103 ... print "%6s a[%d:%d] b[%d:%d]" % opcode
104 equal a[0:8] b[0:8]
105 insert a[8:8] b[8:17]
Tim Peters43898b42006-06-14 04:09:25 +0000106 equal a[8:29] b[17:38]
Tim Peters5e824c32001-08-12 22:25:01 +0000107
108 See the Differ class for a fancy human-friendly file differencer, which
109 uses SequenceMatcher both to compare sequences of lines, and to compare
110 sequences of characters within similar (near-matching) lines.
111
112 See also function get_close_matches() in this module, which shows how
113 simple code building on SequenceMatcher can be used to do useful work.
114
115 Timing: Basic R-O is cubic time worst case and quadratic time expected
116 case. SequenceMatcher is quadratic time for the worst case and has
117 expected-case behavior dependent in a complicated way on how many
118 elements the sequences have in common; best case time is linear.
119
120 Methods:
121
122 __init__(isjunk=None, a='', b='')
123 Construct a SequenceMatcher.
124
125 set_seqs(a, b)
126 Set the two sequences to be compared.
127
128 set_seq1(a)
129 Set the first sequence to be compared.
130
131 set_seq2(b)
132 Set the second sequence to be compared.
133
134 find_longest_match(alo, ahi, blo, bhi)
135 Find longest matching block in a[alo:ahi] and b[blo:bhi].
136
137 get_matching_blocks()
138 Return list of triples describing matching subsequences.
139
140 get_opcodes()
141 Return list of 5-tuples describing how to turn a into b.
142
143 ratio()
144 Return a measure of the sequences' similarity (float in [0,1]).
145
146 quick_ratio()
147 Return an upper bound on .ratio() relatively quickly.
148
149 real_quick_ratio()
150 Return an upper bound on ratio() very quickly.
151 """
152
Tim Peters9ae21482001-02-10 08:00:53 +0000153 def __init__(self, isjunk=None, a='', b=''):
154 """Construct a SequenceMatcher.
155
156 Optional arg isjunk is None (the default), or a one-argument
157 function that takes a sequence element and returns true iff the
Tim Peters5e824c32001-08-12 22:25:01 +0000158 element is junk. None is equivalent to passing "lambda x: 0", i.e.
Fred Drakef1da6282001-02-19 19:30:05 +0000159 no elements are considered to be junk. For example, pass
Tim Peters9ae21482001-02-10 08:00:53 +0000160 lambda x: x in " \\t"
161 if you're comparing lines as sequences of characters, and don't
162 want to synch up on blanks or hard tabs.
163
164 Optional arg a is the first of two sequences to be compared. By
165 default, an empty string. The elements of a must be hashable. See
166 also .set_seqs() and .set_seq1().
167
168 Optional arg b is the second of two sequences to be compared. By
Fred Drakef1da6282001-02-19 19:30:05 +0000169 default, an empty string. The elements of b must be hashable. See
Tim Peters9ae21482001-02-10 08:00:53 +0000170 also .set_seqs() and .set_seq2().
171 """
172
173 # Members:
174 # a
175 # first sequence
176 # b
177 # second sequence; differences are computed as "what do
178 # we need to do to 'a' to change it into 'b'?"
179 # b2j
180 # for x in b, b2j[x] is a list of the indices (into b)
181 # at which x appears; junk elements do not appear
Tim Peters9ae21482001-02-10 08:00:53 +0000182 # fullbcount
183 # for x in b, fullbcount[x] == the number of times x
184 # appears in b; only materialized if really needed (used
185 # only for computing quick_ratio())
186 # matching_blocks
187 # a list of (i, j, k) triples, where a[i:i+k] == b[j:j+k];
188 # ascending & non-overlapping in i and in j; terminated by
189 # a dummy (len(a), len(b), 0) sentinel
190 # opcodes
191 # a list of (tag, i1, i2, j1, j2) tuples, where tag is
192 # one of
193 # 'replace' a[i1:i2] should be replaced by b[j1:j2]
194 # 'delete' a[i1:i2] should be deleted
195 # 'insert' b[j1:j2] should be inserted
196 # 'equal' a[i1:i2] == b[j1:j2]
197 # isjunk
198 # a user-supplied function taking a sequence element and
199 # returning true iff the element is "junk" -- this has
200 # subtle but helpful effects on the algorithm, which I'll
201 # get around to writing up someday <0.9 wink>.
202 # DON'T USE! Only __chain_b uses this. Use isbjunk.
203 # isbjunk
204 # for x in b, isbjunk(x) == isjunk(x) but much faster;
205 # it's really the has_key method of a hidden dict.
206 # DOES NOT WORK for x in a!
Tim Peters81b92512002-04-29 01:37:32 +0000207 # isbpopular
208 # for x in b, isbpopular(x) is true iff b is reasonably long
209 # (at least 200 elements) and x accounts for more than 1% of
210 # its elements. DOES NOT WORK for x in a!
Tim Peters9ae21482001-02-10 08:00:53 +0000211
212 self.isjunk = isjunk
213 self.a = self.b = None
214 self.set_seqs(a, b)
215
216 def set_seqs(self, a, b):
217 """Set the two sequences to be compared.
218
219 >>> s = SequenceMatcher()
220 >>> s.set_seqs("abcd", "bcde")
221 >>> s.ratio()
222 0.75
223 """
224
225 self.set_seq1(a)
226 self.set_seq2(b)
227
228 def set_seq1(self, a):
229 """Set the first sequence to be compared.
230
231 The second sequence to be compared is not changed.
232
233 >>> s = SequenceMatcher(None, "abcd", "bcde")
234 >>> s.ratio()
235 0.75
236 >>> s.set_seq1("bcde")
237 >>> s.ratio()
238 1.0
239 >>>
240
241 SequenceMatcher computes and caches detailed information about the
242 second sequence, so if you want to compare one sequence S against
243 many sequences, use .set_seq2(S) once and call .set_seq1(x)
244 repeatedly for each of the other sequences.
245
246 See also set_seqs() and set_seq2().
247 """
248
249 if a is self.a:
250 return
251 self.a = a
252 self.matching_blocks = self.opcodes = None
253
254 def set_seq2(self, b):
255 """Set the second sequence to be compared.
256
257 The first sequence to be compared is not changed.
258
259 >>> s = SequenceMatcher(None, "abcd", "bcde")
260 >>> s.ratio()
261 0.75
262 >>> s.set_seq2("abcd")
263 >>> s.ratio()
264 1.0
265 >>>
266
267 SequenceMatcher computes and caches detailed information about the
268 second sequence, so if you want to compare one sequence S against
269 many sequences, use .set_seq2(S) once and call .set_seq1(x)
270 repeatedly for each of the other sequences.
271
272 See also set_seqs() and set_seq1().
273 """
274
275 if b is self.b:
276 return
277 self.b = b
278 self.matching_blocks = self.opcodes = None
279 self.fullbcount = None
280 self.__chain_b()
281
282 # For each element x in b, set b2j[x] to a list of the indices in
283 # b where x appears; the indices are in increasing order; note that
284 # the number of times x appears in b is len(b2j[x]) ...
285 # when self.isjunk is defined, junk elements don't show up in this
286 # map at all, which stops the central find_longest_match method
287 # from starting any matching block at a junk element ...
288 # also creates the fast isbjunk function ...
Tim Peters81b92512002-04-29 01:37:32 +0000289 # b2j also does not contain entries for "popular" elements, meaning
290 # elements that account for more than 1% of the total elements, and
291 # when the sequence is reasonably large (>= 200 elements); this can
292 # be viewed as an adaptive notion of semi-junk, and yields an enormous
293 # speedup when, e.g., comparing program files with hundreds of
294 # instances of "return NULL;" ...
Tim Peters9ae21482001-02-10 08:00:53 +0000295 # note that this is only called when b changes; so for cross-product
296 # kinds of matches, it's best to call set_seq2 once, then set_seq1
297 # repeatedly
298
299 def __chain_b(self):
300 # Because isjunk is a user-defined (not C) function, and we test
301 # for junk a LOT, it's important to minimize the number of calls.
302 # Before the tricks described here, __chain_b was by far the most
303 # time-consuming routine in the whole module! If anyone sees
304 # Jim Roskind, thank him again for profile.py -- I never would
305 # have guessed that.
306 # The first trick is to build b2j ignoring the possibility
307 # of junk. I.e., we don't call isjunk at all yet. Throwing
308 # out the junk later is much cheaper than building b2j "right"
309 # from the start.
310 b = self.b
Tim Peters81b92512002-04-29 01:37:32 +0000311 n = len(b)
Tim Peters9ae21482001-02-10 08:00:53 +0000312 self.b2j = b2j = {}
Tim Peters81b92512002-04-29 01:37:32 +0000313 populardict = {}
314 for i, elt in enumerate(b):
315 if elt in b2j:
316 indices = b2j[elt]
317 if n >= 200 and len(indices) * 100 > n:
318 populardict[elt] = 1
319 del indices[:]
320 else:
321 indices.append(i)
Tim Peters9ae21482001-02-10 08:00:53 +0000322 else:
323 b2j[elt] = [i]
324
Tim Peters81b92512002-04-29 01:37:32 +0000325 # Purge leftover indices for popular elements.
326 for elt in populardict:
327 del b2j[elt]
328
Tim Peters9ae21482001-02-10 08:00:53 +0000329 # Now b2j.keys() contains elements uniquely, and especially when
330 # the sequence is a string, that's usually a good deal smaller
331 # than len(string). The difference is the number of isjunk calls
332 # saved.
Tim Peters81b92512002-04-29 01:37:32 +0000333 isjunk = self.isjunk
334 junkdict = {}
Tim Peters9ae21482001-02-10 08:00:53 +0000335 if isjunk:
Tim Peters81b92512002-04-29 01:37:32 +0000336 for d in populardict, b2j:
337 for elt in d.keys():
338 if isjunk(elt):
339 junkdict[elt] = 1
340 del d[elt]
Tim Peters9ae21482001-02-10 08:00:53 +0000341
Raymond Hettinger54f02222002-06-01 14:18:47 +0000342 # Now for x in b, isjunk(x) == x in junkdict, but the
Tim Peters9ae21482001-02-10 08:00:53 +0000343 # latter is much faster. Note too that while there may be a
344 # lot of junk in the sequence, the number of *unique* junk
345 # elements is probably small. So the memory burden of keeping
346 # this dict alive is likely trivial compared to the size of b2j.
347 self.isbjunk = junkdict.has_key
Tim Peters81b92512002-04-29 01:37:32 +0000348 self.isbpopular = populardict.has_key
Tim Peters9ae21482001-02-10 08:00:53 +0000349
350 def find_longest_match(self, alo, ahi, blo, bhi):
351 """Find longest matching block in a[alo:ahi] and b[blo:bhi].
352
353 If isjunk is not defined:
354
355 Return (i,j,k) such that a[i:i+k] is equal to b[j:j+k], where
356 alo <= i <= i+k <= ahi
357 blo <= j <= j+k <= bhi
358 and for all (i',j',k') meeting those conditions,
359 k >= k'
360 i <= i'
361 and if i == i', j <= j'
362
363 In other words, of all maximal matching blocks, return one that
364 starts earliest in a, and of all those maximal matching blocks that
365 start earliest in a, return the one that starts earliest in b.
366
367 >>> s = SequenceMatcher(None, " abcd", "abcd abcd")
368 >>> s.find_longest_match(0, 5, 0, 9)
Raymond Hettinger0ff4daf2008-01-11 03:20:54 +0000369 Match(a=0, b=4, size=5)
Tim Peters9ae21482001-02-10 08:00:53 +0000370
371 If isjunk is defined, first the longest matching block is
372 determined as above, but with the additional restriction that no
373 junk element appears in the block. Then that block is extended as
374 far as possible by matching (only) junk elements on both sides. So
375 the resulting block never matches on junk except as identical junk
376 happens to be adjacent to an "interesting" match.
377
378 Here's the same example as before, but considering blanks to be
379 junk. That prevents " abcd" from matching the " abcd" at the tail
380 end of the second sequence directly. Instead only the "abcd" can
381 match, and matches the leftmost "abcd" in the second sequence:
382
383 >>> s = SequenceMatcher(lambda x: x==" ", " abcd", "abcd abcd")
384 >>> s.find_longest_match(0, 5, 0, 9)
Raymond Hettinger0ff4daf2008-01-11 03:20:54 +0000385 Match(a=1, b=0, size=4)
Tim Peters9ae21482001-02-10 08:00:53 +0000386
387 If no blocks match, return (alo, blo, 0).
388
389 >>> s = SequenceMatcher(None, "ab", "c")
390 >>> s.find_longest_match(0, 2, 0, 1)
Raymond Hettinger0ff4daf2008-01-11 03:20:54 +0000391 Match(a=0, b=0, size=0)
Tim Peters9ae21482001-02-10 08:00:53 +0000392 """
393
394 # CAUTION: stripping common prefix or suffix would be incorrect.
395 # E.g.,
396 # ab
397 # acab
398 # Longest matching block is "ab", but if common prefix is
399 # stripped, it's "a" (tied with "b"). UNIX(tm) diff does so
400 # strip, so ends up claiming that ab is changed to acab by
401 # inserting "ca" in the middle. That's minimal but unintuitive:
402 # "it's obvious" that someone inserted "ac" at the front.
403 # Windiff ends up at the same place as diff, but by pairing up
404 # the unique 'b's and then matching the first two 'a's.
405
406 a, b, b2j, isbjunk = self.a, self.b, self.b2j, self.isbjunk
407 besti, bestj, bestsize = alo, blo, 0
408 # find longest junk-free match
409 # during an iteration of the loop, j2len[j] = length of longest
410 # junk-free match ending with a[i-1] and b[j]
411 j2len = {}
412 nothing = []
413 for i in xrange(alo, ahi):
414 # look at all instances of a[i] in b; note that because
415 # b2j has no junk keys, the loop is skipped if a[i] is junk
416 j2lenget = j2len.get
417 newj2len = {}
418 for j in b2j.get(a[i], nothing):
419 # a[i] matches b[j]
420 if j < blo:
421 continue
422 if j >= bhi:
423 break
424 k = newj2len[j] = j2lenget(j-1, 0) + 1
425 if k > bestsize:
426 besti, bestj, bestsize = i-k+1, j-k+1, k
427 j2len = newj2len
428
Tim Peters81b92512002-04-29 01:37:32 +0000429 # Extend the best by non-junk elements on each end. In particular,
430 # "popular" non-junk elements aren't in b2j, which greatly speeds
431 # the inner loop above, but also means "the best" match so far
432 # doesn't contain any junk *or* popular non-junk elements.
433 while besti > alo and bestj > blo and \
434 not isbjunk(b[bestj-1]) and \
435 a[besti-1] == b[bestj-1]:
436 besti, bestj, bestsize = besti-1, bestj-1, bestsize+1
437 while besti+bestsize < ahi and bestj+bestsize < bhi and \
438 not isbjunk(b[bestj+bestsize]) and \
439 a[besti+bestsize] == b[bestj+bestsize]:
440 bestsize += 1
441
Tim Peters9ae21482001-02-10 08:00:53 +0000442 # Now that we have a wholly interesting match (albeit possibly
443 # empty!), we may as well suck up the matching junk on each
444 # side of it too. Can't think of a good reason not to, and it
445 # saves post-processing the (possibly considerable) expense of
446 # figuring out what to do with it. In the case of an empty
447 # interesting match, this is clearly the right thing to do,
448 # because no other kind of match is possible in the regions.
449 while besti > alo and bestj > blo and \
450 isbjunk(b[bestj-1]) and \
451 a[besti-1] == b[bestj-1]:
452 besti, bestj, bestsize = besti-1, bestj-1, bestsize+1
453 while besti+bestsize < ahi and bestj+bestsize < bhi and \
454 isbjunk(b[bestj+bestsize]) and \
455 a[besti+bestsize] == b[bestj+bestsize]:
456 bestsize = bestsize + 1
457
Raymond Hettinger0ff4daf2008-01-11 03:20:54 +0000458 return Match(besti, bestj, bestsize)
Tim Peters9ae21482001-02-10 08:00:53 +0000459
460 def get_matching_blocks(self):
461 """Return list of triples describing matching subsequences.
462
463 Each triple is of the form (i, j, n), and means that
464 a[i:i+n] == b[j:j+n]. The triples are monotonically increasing in
Tim Peters43898b42006-06-14 04:09:25 +0000465 i and in j. New in Python 2.5, it's also guaranteed that if
466 (i, j, n) and (i', j', n') are adjacent triples in the list, and
467 the second is not the last triple in the list, then i+n != i' or
468 j+n != j'. IOW, adjacent triples never describe adjacent equal
469 blocks.
Tim Peters9ae21482001-02-10 08:00:53 +0000470
471 The last triple is a dummy, (len(a), len(b), 0), and is the only
472 triple with n==0.
473
474 >>> s = SequenceMatcher(None, "abxcd", "abcd")
475 >>> s.get_matching_blocks()
Raymond Hettinger0ff4daf2008-01-11 03:20:54 +0000476 [Match(a=0, b=0, size=2), Match(a=3, b=2, size=2), Match(a=5, b=4, size=0)]
Tim Peters9ae21482001-02-10 08:00:53 +0000477 """
478
479 if self.matching_blocks is not None:
480 return self.matching_blocks
Tim Peters9ae21482001-02-10 08:00:53 +0000481 la, lb = len(self.a), len(self.b)
Gustavo Niemeyer548148812006-01-31 18:34:13 +0000482
Tim Peters7ca66772006-06-13 03:30:07 +0000483 # This is most naturally expressed as a recursive algorithm, but
484 # at least one user bumped into extreme use cases that exceeded
485 # the recursion limit on their box. So, now we maintain a list
486 # ('queue`) of blocks we still need to look at, and append partial
487 # results to `matching_blocks` in a loop; the matches are sorted
488 # at the end.
Gustavo Niemeyer548148812006-01-31 18:34:13 +0000489 queue = [(0, la, 0, lb)]
Tim Peters43898b42006-06-14 04:09:25 +0000490 matching_blocks = []
Gustavo Niemeyer548148812006-01-31 18:34:13 +0000491 while queue:
Gustavo Niemeyer548148812006-01-31 18:34:13 +0000492 alo, ahi, blo, bhi = queue.pop()
Tim Peters7ca66772006-06-13 03:30:07 +0000493 i, j, k = x = self.find_longest_match(alo, ahi, blo, bhi)
Gustavo Niemeyer548148812006-01-31 18:34:13 +0000494 # a[alo:i] vs b[blo:j] unknown
495 # a[i:i+k] same as b[j:j+k]
496 # a[i+k:ahi] vs b[j+k:bhi] unknown
Tim Peters7ca66772006-06-13 03:30:07 +0000497 if k: # if k is 0, there was no matching block
498 matching_blocks.append(x)
Gustavo Niemeyer548148812006-01-31 18:34:13 +0000499 if alo < i and blo < j:
500 queue.append((alo, i, blo, j))
Gustavo Niemeyer548148812006-01-31 18:34:13 +0000501 if i+k < ahi and j+k < bhi:
502 queue.append((i+k, ahi, j+k, bhi))
Tim Peters7ca66772006-06-13 03:30:07 +0000503 matching_blocks.sort()
Tim Peters43898b42006-06-14 04:09:25 +0000504
505 # It's possible that we have adjacent equal blocks in the
506 # matching_blocks list now. Starting with 2.5, this code was added
507 # to collapse them.
508 i1 = j1 = k1 = 0
509 non_adjacent = []
510 for i2, j2, k2 in matching_blocks:
511 # Is this block adjacent to i1, j1, k1?
512 if i1 + k1 == i2 and j1 + k1 == j2:
513 # Yes, so collapse them -- this just increases the length of
514 # the first block by the length of the second, and the first
Tim Peters61bdd392006-06-14 04:13:00 +0000515 # block so lengthened remains the block to compare against.
Tim Peters43898b42006-06-14 04:09:25 +0000516 k1 += k2
517 else:
518 # Not adjacent. Remember the first block (k1==0 means it's
519 # the dummy we started with), and make the second block the
520 # new block to compare against.
521 if k1:
522 non_adjacent.append((i1, j1, k1))
523 i1, j1, k1 = i2, j2, k2
524 if k1:
525 non_adjacent.append((i1, j1, k1))
526
527 non_adjacent.append( (la, lb, 0) )
528 self.matching_blocks = non_adjacent
Raymond Hettinger0ff4daf2008-01-11 03:20:54 +0000529 return map(Match._make, self.matching_blocks)
Tim Peters9ae21482001-02-10 08:00:53 +0000530
Tim Peters9ae21482001-02-10 08:00:53 +0000531 def get_opcodes(self):
532 """Return list of 5-tuples describing how to turn a into b.
533
534 Each tuple is of the form (tag, i1, i2, j1, j2). The first tuple
535 has i1 == j1 == 0, and remaining tuples have i1 == the i2 from the
536 tuple preceding it, and likewise for j1 == the previous j2.
537
538 The tags are strings, with these meanings:
539
540 'replace': a[i1:i2] should be replaced by b[j1:j2]
541 'delete': a[i1:i2] should be deleted.
542 Note that j1==j2 in this case.
543 'insert': b[j1:j2] should be inserted at a[i1:i1].
544 Note that i1==i2 in this case.
545 'equal': a[i1:i2] == b[j1:j2]
546
547 >>> a = "qabxcd"
548 >>> b = "abycdf"
549 >>> s = SequenceMatcher(None, a, b)
550 >>> for tag, i1, i2, j1, j2 in s.get_opcodes():
551 ... print ("%7s a[%d:%d] (%s) b[%d:%d] (%s)" %
552 ... (tag, i1, i2, a[i1:i2], j1, j2, b[j1:j2]))
553 delete a[0:1] (q) b[0:0] ()
554 equal a[1:3] (ab) b[0:2] (ab)
555 replace a[3:4] (x) b[2:3] (y)
556 equal a[4:6] (cd) b[3:5] (cd)
557 insert a[6:6] () b[5:6] (f)
558 """
559
560 if self.opcodes is not None:
561 return self.opcodes
562 i = j = 0
563 self.opcodes = answer = []
564 for ai, bj, size in self.get_matching_blocks():
565 # invariant: we've pumped out correct diffs to change
566 # a[:i] into b[:j], and the next matching block is
567 # a[ai:ai+size] == b[bj:bj+size]. So we need to pump
568 # out a diff to change a[i:ai] into b[j:bj], pump out
569 # the matching block, and move (i,j) beyond the match
570 tag = ''
571 if i < ai and j < bj:
572 tag = 'replace'
573 elif i < ai:
574 tag = 'delete'
575 elif j < bj:
576 tag = 'insert'
577 if tag:
578 answer.append( (tag, i, ai, j, bj) )
579 i, j = ai+size, bj+size
580 # the list of matching blocks is terminated by a
581 # sentinel with size 0
582 if size:
583 answer.append( ('equal', ai, i, bj, j) )
584 return answer
585
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +0000586 def get_grouped_opcodes(self, n=3):
587 """ Isolate change clusters by eliminating ranges with no changes.
588
589 Return a generator of groups with upto n lines of context.
590 Each group is in the same format as returned by get_opcodes().
591
592 >>> from pprint import pprint
593 >>> a = map(str, range(1,40))
594 >>> b = a[:]
595 >>> b[8:8] = ['i'] # Make an insertion
596 >>> b[20] += 'x' # Make a replacement
597 >>> b[23:28] = [] # Make a deletion
598 >>> b[30] += 'y' # Make another replacement
599 >>> pprint(list(SequenceMatcher(None,a,b).get_grouped_opcodes()))
600 [[('equal', 5, 8, 5, 8), ('insert', 8, 8, 8, 9), ('equal', 8, 11, 9, 12)],
601 [('equal', 16, 19, 17, 20),
602 ('replace', 19, 20, 20, 21),
603 ('equal', 20, 22, 21, 23),
604 ('delete', 22, 27, 23, 23),
605 ('equal', 27, 30, 23, 26)],
606 [('equal', 31, 34, 27, 30),
607 ('replace', 34, 35, 30, 31),
608 ('equal', 35, 38, 31, 34)]]
609 """
610
611 codes = self.get_opcodes()
Brett Cannond2c5b4b2004-07-10 23:54:07 +0000612 if not codes:
613 codes = [("equal", 0, 1, 0, 1)]
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +0000614 # Fixup leading and trailing groups if they show no changes.
615 if codes[0][0] == 'equal':
616 tag, i1, i2, j1, j2 = codes[0]
617 codes[0] = tag, max(i1, i2-n), i2, max(j1, j2-n), j2
618 if codes[-1][0] == 'equal':
619 tag, i1, i2, j1, j2 = codes[-1]
620 codes[-1] = tag, i1, min(i2, i1+n), j1, min(j2, j1+n)
621
622 nn = n + n
623 group = []
624 for tag, i1, i2, j1, j2 in codes:
625 # End the current group and start a new one whenever
626 # there is a large range with no changes.
627 if tag == 'equal' and i2-i1 > nn:
628 group.append((tag, i1, min(i2, i1+n), j1, min(j2, j1+n)))
629 yield group
630 group = []
631 i1, j1 = max(i1, i2-n), max(j1, j2-n)
632 group.append((tag, i1, i2, j1 ,j2))
633 if group and not (len(group)==1 and group[0][0] == 'equal'):
634 yield group
635
Tim Peters9ae21482001-02-10 08:00:53 +0000636 def ratio(self):
637 """Return a measure of the sequences' similarity (float in [0,1]).
638
639 Where T is the total number of elements in both sequences, and
Tim Petersbcc95cb2004-07-31 00:19:43 +0000640 M is the number of matches, this is 2.0*M / T.
Tim Peters9ae21482001-02-10 08:00:53 +0000641 Note that this is 1 if the sequences are identical, and 0 if
642 they have nothing in common.
643
644 .ratio() is expensive to compute if you haven't already computed
645 .get_matching_blocks() or .get_opcodes(), in which case you may
646 want to try .quick_ratio() or .real_quick_ratio() first to get an
647 upper bound.
648
649 >>> s = SequenceMatcher(None, "abcd", "bcde")
650 >>> s.ratio()
651 0.75
652 >>> s.quick_ratio()
653 0.75
654 >>> s.real_quick_ratio()
655 1.0
656 """
657
658 matches = reduce(lambda sum, triple: sum + triple[-1],
659 self.get_matching_blocks(), 0)
Neal Norwitze7dfe212003-07-01 14:59:46 +0000660 return _calculate_ratio(matches, len(self.a) + len(self.b))
Tim Peters9ae21482001-02-10 08:00:53 +0000661
662 def quick_ratio(self):
663 """Return an upper bound on ratio() relatively quickly.
664
665 This isn't defined beyond that it is an upper bound on .ratio(), and
666 is faster to compute.
667 """
668
669 # viewing a and b as multisets, set matches to the cardinality
670 # of their intersection; this counts the number of matches
671 # without regard to order, so is clearly an upper bound
672 if self.fullbcount is None:
673 self.fullbcount = fullbcount = {}
674 for elt in self.b:
675 fullbcount[elt] = fullbcount.get(elt, 0) + 1
676 fullbcount = self.fullbcount
677 # avail[x] is the number of times x appears in 'b' less the
678 # number of times we've seen it in 'a' so far ... kinda
679 avail = {}
680 availhas, matches = avail.has_key, 0
681 for elt in self.a:
682 if availhas(elt):
683 numb = avail[elt]
684 else:
685 numb = fullbcount.get(elt, 0)
686 avail[elt] = numb - 1
687 if numb > 0:
688 matches = matches + 1
Neal Norwitze7dfe212003-07-01 14:59:46 +0000689 return _calculate_ratio(matches, len(self.a) + len(self.b))
Tim Peters9ae21482001-02-10 08:00:53 +0000690
691 def real_quick_ratio(self):
692 """Return an upper bound on ratio() very quickly.
693
694 This isn't defined beyond that it is an upper bound on .ratio(), and
695 is faster to compute than either .ratio() or .quick_ratio().
696 """
697
698 la, lb = len(self.a), len(self.b)
699 # can't have more matches than the number of elements in the
700 # shorter sequence
Neal Norwitze7dfe212003-07-01 14:59:46 +0000701 return _calculate_ratio(min(la, lb), la + lb)
Tim Peters9ae21482001-02-10 08:00:53 +0000702
703def get_close_matches(word, possibilities, n=3, cutoff=0.6):
704 """Use SequenceMatcher to return list of the best "good enough" matches.
705
706 word is a sequence for which close matches are desired (typically a
707 string).
708
709 possibilities is a list of sequences against which to match word
710 (typically a list of strings).
711
712 Optional arg n (default 3) is the maximum number of close matches to
713 return. n must be > 0.
714
715 Optional arg cutoff (default 0.6) is a float in [0, 1]. Possibilities
716 that don't score at least that similar to word are ignored.
717
718 The best (no more than n) matches among the possibilities are returned
719 in a list, sorted by similarity score, most similar first.
720
721 >>> get_close_matches("appel", ["ape", "apple", "peach", "puppy"])
722 ['apple', 'ape']
Tim Peters5e824c32001-08-12 22:25:01 +0000723 >>> import keyword as _keyword
724 >>> get_close_matches("wheel", _keyword.kwlist)
Tim Peters9ae21482001-02-10 08:00:53 +0000725 ['while']
Tim Peters5e824c32001-08-12 22:25:01 +0000726 >>> get_close_matches("apple", _keyword.kwlist)
Tim Peters9ae21482001-02-10 08:00:53 +0000727 []
Tim Peters5e824c32001-08-12 22:25:01 +0000728 >>> get_close_matches("accept", _keyword.kwlist)
Tim Peters9ae21482001-02-10 08:00:53 +0000729 ['except']
730 """
731
732 if not n > 0:
Walter Dörwald70a6b492004-02-12 17:35:32 +0000733 raise ValueError("n must be > 0: %r" % (n,))
Tim Peters9ae21482001-02-10 08:00:53 +0000734 if not 0.0 <= cutoff <= 1.0:
Walter Dörwald70a6b492004-02-12 17:35:32 +0000735 raise ValueError("cutoff must be in [0.0, 1.0]: %r" % (cutoff,))
Tim Peters9ae21482001-02-10 08:00:53 +0000736 result = []
737 s = SequenceMatcher()
738 s.set_seq2(word)
739 for x in possibilities:
740 s.set_seq1(x)
741 if s.real_quick_ratio() >= cutoff and \
742 s.quick_ratio() >= cutoff and \
743 s.ratio() >= cutoff:
744 result.append((s.ratio(), x))
Tim Peters9ae21482001-02-10 08:00:53 +0000745
Raymond Hettinger6b59f5f2003-10-16 05:53:16 +0000746 # Move the best scorers to head of list
Raymond Hettingeraefde432004-06-15 23:53:35 +0000747 result = heapq.nlargest(n, result)
Raymond Hettinger6b59f5f2003-10-16 05:53:16 +0000748 # Strip scores for the best n matches
Raymond Hettingerbb6b7342004-06-13 09:57:33 +0000749 return [x for score, x in result]
Tim Peters5e824c32001-08-12 22:25:01 +0000750
751def _count_leading(line, ch):
752 """
753 Return number of `ch` characters at the start of `line`.
754
755 Example:
756
757 >>> _count_leading(' abc', ' ')
758 3
759 """
760
761 i, n = 0, len(line)
762 while i < n and line[i] == ch:
763 i += 1
764 return i
765
766class Differ:
767 r"""
768 Differ is a class for comparing sequences of lines of text, and
769 producing human-readable differences or deltas. Differ uses
770 SequenceMatcher both to compare sequences of lines, and to compare
771 sequences of characters within similar (near-matching) lines.
772
773 Each line of a Differ delta begins with a two-letter code:
774
775 '- ' line unique to sequence 1
776 '+ ' line unique to sequence 2
777 ' ' line common to both sequences
778 '? ' line not present in either input sequence
779
780 Lines beginning with '? ' attempt to guide the eye to intraline
781 differences, and were not present in either input sequence. These lines
782 can be confusing if the sequences contain tab characters.
783
784 Note that Differ makes no claim to produce a *minimal* diff. To the
785 contrary, minimal diffs are often counter-intuitive, because they synch
786 up anywhere possible, sometimes accidental matches 100 pages apart.
787 Restricting synch points to contiguous matches preserves some notion of
788 locality, at the occasional cost of producing a longer diff.
789
790 Example: Comparing two texts.
791
792 First we set up the texts, sequences of individual single-line strings
793 ending with newlines (such sequences can also be obtained from the
794 `readlines()` method of file-like objects):
795
796 >>> text1 = ''' 1. Beautiful is better than ugly.
797 ... 2. Explicit is better than implicit.
798 ... 3. Simple is better than complex.
799 ... 4. Complex is better than complicated.
800 ... '''.splitlines(1)
801 >>> len(text1)
802 4
803 >>> text1[0][-1]
804 '\n'
805 >>> text2 = ''' 1. Beautiful is better than ugly.
806 ... 3. Simple is better than complex.
807 ... 4. Complicated is better than complex.
808 ... 5. Flat is better than nested.
809 ... '''.splitlines(1)
810
811 Next we instantiate a Differ object:
812
813 >>> d = Differ()
814
815 Note that when instantiating a Differ object we may pass functions to
816 filter out line and character 'junk'. See Differ.__init__ for details.
817
818 Finally, we compare the two:
819
Tim Peters8a9c2842001-09-22 21:30:22 +0000820 >>> result = list(d.compare(text1, text2))
Tim Peters5e824c32001-08-12 22:25:01 +0000821
822 'result' is a list of strings, so let's pretty-print it:
823
824 >>> from pprint import pprint as _pprint
825 >>> _pprint(result)
826 [' 1. Beautiful is better than ugly.\n',
827 '- 2. Explicit is better than implicit.\n',
828 '- 3. Simple is better than complex.\n',
829 '+ 3. Simple is better than complex.\n',
830 '? ++\n',
831 '- 4. Complex is better than complicated.\n',
832 '? ^ ---- ^\n',
833 '+ 4. Complicated is better than complex.\n',
834 '? ++++ ^ ^\n',
835 '+ 5. Flat is better than nested.\n']
836
837 As a single multi-line string it looks like this:
838
839 >>> print ''.join(result),
840 1. Beautiful is better than ugly.
841 - 2. Explicit is better than implicit.
842 - 3. Simple is better than complex.
843 + 3. Simple is better than complex.
844 ? ++
845 - 4. Complex is better than complicated.
846 ? ^ ---- ^
847 + 4. Complicated is better than complex.
848 ? ++++ ^ ^
849 + 5. Flat is better than nested.
850
851 Methods:
852
853 __init__(linejunk=None, charjunk=None)
854 Construct a text differencer, with optional filters.
855
856 compare(a, b)
Tim Peters8a9c2842001-09-22 21:30:22 +0000857 Compare two sequences of lines; generate the resulting delta.
Tim Peters5e824c32001-08-12 22:25:01 +0000858 """
859
860 def __init__(self, linejunk=None, charjunk=None):
861 """
862 Construct a text differencer, with optional filters.
863
864 The two optional keyword parameters are for filter functions:
865
866 - `linejunk`: A function that should accept a single string argument,
867 and return true iff the string is junk. The module-level function
868 `IS_LINE_JUNK` may be used to filter out lines without visible
Tim Peters81b92512002-04-29 01:37:32 +0000869 characters, except for at most one splat ('#'). It is recommended
870 to leave linejunk None; as of Python 2.3, the underlying
871 SequenceMatcher class has grown an adaptive notion of "noise" lines
872 that's better than any static definition the author has ever been
873 able to craft.
Tim Peters5e824c32001-08-12 22:25:01 +0000874
875 - `charjunk`: A function that should accept a string of length 1. The
876 module-level function `IS_CHARACTER_JUNK` may be used to filter out
877 whitespace characters (a blank or tab; **note**: bad idea to include
Tim Peters81b92512002-04-29 01:37:32 +0000878 newline in this!). Use of IS_CHARACTER_JUNK is recommended.
Tim Peters5e824c32001-08-12 22:25:01 +0000879 """
880
881 self.linejunk = linejunk
882 self.charjunk = charjunk
Tim Peters5e824c32001-08-12 22:25:01 +0000883
884 def compare(self, a, b):
885 r"""
Tim Peters8a9c2842001-09-22 21:30:22 +0000886 Compare two sequences of lines; generate the resulting delta.
Tim Peters5e824c32001-08-12 22:25:01 +0000887
888 Each sequence must contain individual single-line strings ending with
889 newlines. Such sequences can be obtained from the `readlines()` method
Tim Peters8a9c2842001-09-22 21:30:22 +0000890 of file-like objects. The delta generated also consists of newline-
891 terminated strings, ready to be printed as-is via the writeline()
Tim Peters5e824c32001-08-12 22:25:01 +0000892 method of a file-like object.
893
894 Example:
895
896 >>> print ''.join(Differ().compare('one\ntwo\nthree\n'.splitlines(1),
897 ... 'ore\ntree\nemu\n'.splitlines(1))),
898 - one
899 ? ^
900 + ore
901 ? ^
902 - two
903 - three
904 ? -
905 + tree
906 + emu
907 """
908
909 cruncher = SequenceMatcher(self.linejunk, a, b)
910 for tag, alo, ahi, blo, bhi in cruncher.get_opcodes():
911 if tag == 'replace':
Tim Peters8a9c2842001-09-22 21:30:22 +0000912 g = self._fancy_replace(a, alo, ahi, b, blo, bhi)
Tim Peters5e824c32001-08-12 22:25:01 +0000913 elif tag == 'delete':
Tim Peters8a9c2842001-09-22 21:30:22 +0000914 g = self._dump('-', a, alo, ahi)
Tim Peters5e824c32001-08-12 22:25:01 +0000915 elif tag == 'insert':
Tim Peters8a9c2842001-09-22 21:30:22 +0000916 g = self._dump('+', b, blo, bhi)
Tim Peters5e824c32001-08-12 22:25:01 +0000917 elif tag == 'equal':
Tim Peters8a9c2842001-09-22 21:30:22 +0000918 g = self._dump(' ', a, alo, ahi)
Tim Peters5e824c32001-08-12 22:25:01 +0000919 else:
Walter Dörwald70a6b492004-02-12 17:35:32 +0000920 raise ValueError, 'unknown tag %r' % (tag,)
Tim Peters8a9c2842001-09-22 21:30:22 +0000921
922 for line in g:
923 yield line
Tim Peters5e824c32001-08-12 22:25:01 +0000924
925 def _dump(self, tag, x, lo, hi):
Tim Peters8a9c2842001-09-22 21:30:22 +0000926 """Generate comparison results for a same-tagged range."""
Tim Peters5e824c32001-08-12 22:25:01 +0000927 for i in xrange(lo, hi):
Tim Peters8a9c2842001-09-22 21:30:22 +0000928 yield '%s %s' % (tag, x[i])
Tim Peters5e824c32001-08-12 22:25:01 +0000929
930 def _plain_replace(self, a, alo, ahi, b, blo, bhi):
931 assert alo < ahi and blo < bhi
932 # dump the shorter block first -- reduces the burden on short-term
933 # memory if the blocks are of very different sizes
934 if bhi - blo < ahi - alo:
Tim Peters8a9c2842001-09-22 21:30:22 +0000935 first = self._dump('+', b, blo, bhi)
936 second = self._dump('-', a, alo, ahi)
Tim Peters5e824c32001-08-12 22:25:01 +0000937 else:
Tim Peters8a9c2842001-09-22 21:30:22 +0000938 first = self._dump('-', a, alo, ahi)
939 second = self._dump('+', b, blo, bhi)
940
941 for g in first, second:
942 for line in g:
943 yield line
Tim Peters5e824c32001-08-12 22:25:01 +0000944
945 def _fancy_replace(self, a, alo, ahi, b, blo, bhi):
946 r"""
947 When replacing one block of lines with another, search the blocks
948 for *similar* lines; the best-matching pair (if any) is used as a
949 synch point, and intraline difference marking is done on the
950 similar pair. Lots of work, but often worth it.
951
952 Example:
953
954 >>> d = Differ()
Raymond Hettinger83325e92003-07-16 04:32:32 +0000955 >>> results = d._fancy_replace(['abcDefghiJkl\n'], 0, 1,
956 ... ['abcdefGhijkl\n'], 0, 1)
957 >>> print ''.join(results),
Tim Peters5e824c32001-08-12 22:25:01 +0000958 - abcDefghiJkl
959 ? ^ ^ ^
960 + abcdefGhijkl
961 ? ^ ^ ^
962 """
963
Tim Peters5e824c32001-08-12 22:25:01 +0000964 # don't synch up unless the lines have a similarity score of at
965 # least cutoff; best_ratio tracks the best score seen so far
966 best_ratio, cutoff = 0.74, 0.75
967 cruncher = SequenceMatcher(self.charjunk)
968 eqi, eqj = None, None # 1st indices of equal lines (if any)
969
970 # search for the pair that matches best without being identical
971 # (identical lines must be junk lines, & we don't want to synch up
972 # on junk -- unless we have to)
973 for j in xrange(blo, bhi):
974 bj = b[j]
975 cruncher.set_seq2(bj)
976 for i in xrange(alo, ahi):
977 ai = a[i]
978 if ai == bj:
979 if eqi is None:
980 eqi, eqj = i, j
981 continue
982 cruncher.set_seq1(ai)
983 # computing similarity is expensive, so use the quick
984 # upper bounds first -- have seen this speed up messy
985 # compares by a factor of 3.
986 # note that ratio() is only expensive to compute the first
987 # time it's called on a sequence pair; the expensive part
988 # of the computation is cached by cruncher
989 if cruncher.real_quick_ratio() > best_ratio and \
990 cruncher.quick_ratio() > best_ratio and \
991 cruncher.ratio() > best_ratio:
992 best_ratio, best_i, best_j = cruncher.ratio(), i, j
993 if best_ratio < cutoff:
994 # no non-identical "pretty close" pair
995 if eqi is None:
996 # no identical pair either -- treat it as a straight replace
Tim Peters8a9c2842001-09-22 21:30:22 +0000997 for line in self._plain_replace(a, alo, ahi, b, blo, bhi):
998 yield line
Tim Peters5e824c32001-08-12 22:25:01 +0000999 return
1000 # no close pair, but an identical pair -- synch up on that
1001 best_i, best_j, best_ratio = eqi, eqj, 1.0
1002 else:
1003 # there's a close pair, so forget the identical pair (if any)
1004 eqi = None
1005
1006 # a[best_i] very similar to b[best_j]; eqi is None iff they're not
1007 # identical
Tim Peters5e824c32001-08-12 22:25:01 +00001008
1009 # pump out diffs from before the synch point
Tim Peters8a9c2842001-09-22 21:30:22 +00001010 for line in self._fancy_helper(a, alo, best_i, b, blo, best_j):
1011 yield line
Tim Peters5e824c32001-08-12 22:25:01 +00001012
1013 # do intraline marking on the synch pair
1014 aelt, belt = a[best_i], b[best_j]
1015 if eqi is None:
1016 # pump out a '-', '?', '+', '?' quad for the synched lines
1017 atags = btags = ""
1018 cruncher.set_seqs(aelt, belt)
1019 for tag, ai1, ai2, bj1, bj2 in cruncher.get_opcodes():
1020 la, lb = ai2 - ai1, bj2 - bj1
1021 if tag == 'replace':
1022 atags += '^' * la
1023 btags += '^' * lb
1024 elif tag == 'delete':
1025 atags += '-' * la
1026 elif tag == 'insert':
1027 btags += '+' * lb
1028 elif tag == 'equal':
1029 atags += ' ' * la
1030 btags += ' ' * lb
1031 else:
Walter Dörwald70a6b492004-02-12 17:35:32 +00001032 raise ValueError, 'unknown tag %r' % (tag,)
Tim Peters8a9c2842001-09-22 21:30:22 +00001033 for line in self._qformat(aelt, belt, atags, btags):
1034 yield line
Tim Peters5e824c32001-08-12 22:25:01 +00001035 else:
1036 # the synch pair is identical
Tim Peters8a9c2842001-09-22 21:30:22 +00001037 yield ' ' + aelt
Tim Peters5e824c32001-08-12 22:25:01 +00001038
1039 # pump out diffs from after the synch point
Tim Peters8a9c2842001-09-22 21:30:22 +00001040 for line in self._fancy_helper(a, best_i+1, ahi, b, best_j+1, bhi):
1041 yield line
Tim Peters5e824c32001-08-12 22:25:01 +00001042
1043 def _fancy_helper(self, a, alo, ahi, b, blo, bhi):
Tim Peters8a9c2842001-09-22 21:30:22 +00001044 g = []
Tim Peters5e824c32001-08-12 22:25:01 +00001045 if alo < ahi:
1046 if blo < bhi:
Tim Peters8a9c2842001-09-22 21:30:22 +00001047 g = self._fancy_replace(a, alo, ahi, b, blo, bhi)
Tim Peters5e824c32001-08-12 22:25:01 +00001048 else:
Tim Peters8a9c2842001-09-22 21:30:22 +00001049 g = self._dump('-', a, alo, ahi)
Tim Peters5e824c32001-08-12 22:25:01 +00001050 elif blo < bhi:
Tim Peters8a9c2842001-09-22 21:30:22 +00001051 g = self._dump('+', b, blo, bhi)
1052
1053 for line in g:
1054 yield line
Tim Peters5e824c32001-08-12 22:25:01 +00001055
1056 def _qformat(self, aline, bline, atags, btags):
1057 r"""
1058 Format "?" output and deal with leading tabs.
1059
1060 Example:
1061
1062 >>> d = Differ()
Raymond Hettinger83325e92003-07-16 04:32:32 +00001063 >>> results = d._qformat('\tabcDefghiJkl\n', '\t\tabcdefGhijkl\n',
1064 ... ' ^ ^ ^ ', '+ ^ ^ ^ ')
1065 >>> for line in results: print repr(line)
Tim Peters5e824c32001-08-12 22:25:01 +00001066 ...
1067 '- \tabcDefghiJkl\n'
1068 '? \t ^ ^ ^\n'
1069 '+ \t\tabcdefGhijkl\n'
1070 '? \t ^ ^ ^\n'
1071 """
1072
1073 # Can hurt, but will probably help most of the time.
1074 common = min(_count_leading(aline, "\t"),
1075 _count_leading(bline, "\t"))
1076 common = min(common, _count_leading(atags[:common], " "))
1077 atags = atags[common:].rstrip()
1078 btags = btags[common:].rstrip()
1079
Tim Peters8a9c2842001-09-22 21:30:22 +00001080 yield "- " + aline
Tim Peters5e824c32001-08-12 22:25:01 +00001081 if atags:
Tim Peters527e64f2001-10-04 05:36:56 +00001082 yield "? %s%s\n" % ("\t" * common, atags)
Tim Peters5e824c32001-08-12 22:25:01 +00001083
Tim Peters8a9c2842001-09-22 21:30:22 +00001084 yield "+ " + bline
Tim Peters5e824c32001-08-12 22:25:01 +00001085 if btags:
Tim Peters8a9c2842001-09-22 21:30:22 +00001086 yield "? %s%s\n" % ("\t" * common, btags)
Tim Peters5e824c32001-08-12 22:25:01 +00001087
1088# With respect to junk, an earlier version of ndiff simply refused to
1089# *start* a match with a junk element. The result was cases like this:
1090# before: private Thread currentThread;
1091# after: private volatile Thread currentThread;
1092# If you consider whitespace to be junk, the longest contiguous match
1093# not starting with junk is "e Thread currentThread". So ndiff reported
1094# that "e volatil" was inserted between the 't' and the 'e' in "private".
1095# While an accurate view, to people that's absurd. The current version
1096# looks for matching blocks that are entirely junk-free, then extends the
1097# longest one of those as far as possible but only with matching junk.
1098# So now "currentThread" is matched, then extended to suck up the
1099# preceding blank; then "private" is matched, and extended to suck up the
1100# following blank; then "Thread" is matched; and finally ndiff reports
1101# that "volatile " was inserted before "Thread". The only quibble
1102# remaining is that perhaps it was really the case that " volatile"
1103# was inserted after "private". I can live with that <wink>.
1104
1105import re
1106
1107def IS_LINE_JUNK(line, pat=re.compile(r"\s*#?\s*$").match):
1108 r"""
1109 Return 1 for ignorable line: iff `line` is blank or contains a single '#'.
1110
1111 Examples:
1112
1113 >>> IS_LINE_JUNK('\n')
Guido van Rossum77f6a652002-04-03 22:41:51 +00001114 True
Tim Peters5e824c32001-08-12 22:25:01 +00001115 >>> IS_LINE_JUNK(' # \n')
Guido van Rossum77f6a652002-04-03 22:41:51 +00001116 True
Tim Peters5e824c32001-08-12 22:25:01 +00001117 >>> IS_LINE_JUNK('hello\n')
Guido van Rossum77f6a652002-04-03 22:41:51 +00001118 False
Tim Peters5e824c32001-08-12 22:25:01 +00001119 """
1120
1121 return pat(line) is not None
1122
1123def IS_CHARACTER_JUNK(ch, ws=" \t"):
1124 r"""
1125 Return 1 for ignorable character: iff `ch` is a space or tab.
1126
1127 Examples:
1128
1129 >>> IS_CHARACTER_JUNK(' ')
Guido van Rossum77f6a652002-04-03 22:41:51 +00001130 True
Tim Peters5e824c32001-08-12 22:25:01 +00001131 >>> IS_CHARACTER_JUNK('\t')
Guido van Rossum77f6a652002-04-03 22:41:51 +00001132 True
Tim Peters5e824c32001-08-12 22:25:01 +00001133 >>> IS_CHARACTER_JUNK('\n')
Guido van Rossum77f6a652002-04-03 22:41:51 +00001134 False
Tim Peters5e824c32001-08-12 22:25:01 +00001135 >>> IS_CHARACTER_JUNK('x')
Guido van Rossum77f6a652002-04-03 22:41:51 +00001136 False
Tim Peters5e824c32001-08-12 22:25:01 +00001137 """
1138
1139 return ch in ws
1140
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00001141
1142def unified_diff(a, b, fromfile='', tofile='', fromfiledate='',
1143 tofiledate='', n=3, lineterm='\n'):
1144 r"""
1145 Compare two sequences of lines; generate the delta as a unified diff.
1146
1147 Unified diffs are a compact way of showing line changes and a few
1148 lines of context. The number of context lines is set by 'n' which
1149 defaults to three.
1150
Raymond Hettinger0887c732003-06-17 16:53:25 +00001151 By default, the diff control lines (those with ---, +++, or @@) are
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00001152 created with a trailing newline. This is helpful so that inputs
1153 created from file.readlines() result in diffs that are suitable for
1154 file.writelines() since both the inputs and outputs have trailing
1155 newlines.
1156
1157 For inputs that do not have trailing newlines, set the lineterm
1158 argument to "" so that the output will be uniformly newline free.
1159
1160 The unidiff format normally has a header for filenames and modification
1161 times. Any or all of these may be specified using strings for
1162 'fromfile', 'tofile', 'fromfiledate', and 'tofiledate'. The modification
1163 times are normally expressed in the format returned by time.ctime().
1164
1165 Example:
1166
1167 >>> for line in unified_diff('one two three four'.split(),
1168 ... 'zero one tree four'.split(), 'Original', 'Current',
1169 ... 'Sat Jan 26 23:30:50 1991', 'Fri Jun 06 10:20:52 2003',
1170 ... lineterm=''):
1171 ... print line
1172 --- Original Sat Jan 26 23:30:50 1991
1173 +++ Current Fri Jun 06 10:20:52 2003
1174 @@ -1,4 +1,4 @@
1175 +zero
1176 one
1177 -two
1178 -three
1179 +tree
1180 four
1181 """
1182
1183 started = False
1184 for group in SequenceMatcher(None,a,b).get_grouped_opcodes(n):
1185 if not started:
1186 yield '--- %s %s%s' % (fromfile, fromfiledate, lineterm)
1187 yield '+++ %s %s%s' % (tofile, tofiledate, lineterm)
1188 started = True
1189 i1, i2, j1, j2 = group[0][1], group[-1][2], group[0][3], group[-1][4]
1190 yield "@@ -%d,%d +%d,%d @@%s" % (i1+1, i2-i1, j1+1, j2-j1, lineterm)
1191 for tag, i1, i2, j1, j2 in group:
1192 if tag == 'equal':
1193 for line in a[i1:i2]:
1194 yield ' ' + line
1195 continue
1196 if tag == 'replace' or tag == 'delete':
1197 for line in a[i1:i2]:
1198 yield '-' + line
1199 if tag == 'replace' or tag == 'insert':
1200 for line in b[j1:j2]:
1201 yield '+' + line
1202
1203# See http://www.unix.org/single_unix_specification/
1204def context_diff(a, b, fromfile='', tofile='',
1205 fromfiledate='', tofiledate='', n=3, lineterm='\n'):
1206 r"""
1207 Compare two sequences of lines; generate the delta as a context diff.
1208
1209 Context diffs are a compact way of showing line changes and a few
1210 lines of context. The number of context lines is set by 'n' which
1211 defaults to three.
1212
1213 By default, the diff control lines (those with *** or ---) are
1214 created with a trailing newline. This is helpful so that inputs
1215 created from file.readlines() result in diffs that are suitable for
1216 file.writelines() since both the inputs and outputs have trailing
1217 newlines.
1218
1219 For inputs that do not have trailing newlines, set the lineterm
1220 argument to "" so that the output will be uniformly newline free.
1221
1222 The context diff format normally has a header for filenames and
1223 modification times. Any or all of these may be specified using
1224 strings for 'fromfile', 'tofile', 'fromfiledate', and 'tofiledate'.
1225 The modification times are normally expressed in the format returned
1226 by time.ctime(). If not specified, the strings default to blanks.
1227
1228 Example:
1229
1230 >>> print ''.join(context_diff('one\ntwo\nthree\nfour\n'.splitlines(1),
1231 ... 'zero\none\ntree\nfour\n'.splitlines(1), 'Original', 'Current',
1232 ... 'Sat Jan 26 23:30:50 1991', 'Fri Jun 06 10:22:46 2003')),
1233 *** Original Sat Jan 26 23:30:50 1991
1234 --- Current Fri Jun 06 10:22:46 2003
1235 ***************
1236 *** 1,4 ****
1237 one
1238 ! two
1239 ! three
1240 four
1241 --- 1,4 ----
1242 + zero
1243 one
1244 ! tree
1245 four
1246 """
1247
1248 started = False
Raymond Hettinger7f2d3022003-06-08 19:38:42 +00001249 prefixmap = {'insert':'+ ', 'delete':'- ', 'replace':'! ', 'equal':' '}
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00001250 for group in SequenceMatcher(None,a,b).get_grouped_opcodes(n):
1251 if not started:
1252 yield '*** %s %s%s' % (fromfile, fromfiledate, lineterm)
1253 yield '--- %s %s%s' % (tofile, tofiledate, lineterm)
1254 started = True
Raymond Hettinger7f2d3022003-06-08 19:38:42 +00001255
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00001256 yield '***************%s' % (lineterm,)
1257 if group[-1][2] - group[0][1] >= 2:
1258 yield '*** %d,%d ****%s' % (group[0][1]+1, group[-1][2], lineterm)
1259 else:
1260 yield '*** %d ****%s' % (group[-1][2], lineterm)
Raymond Hettinger7f2d3022003-06-08 19:38:42 +00001261 visiblechanges = [e for e in group if e[0] in ('replace', 'delete')]
1262 if visiblechanges:
1263 for tag, i1, i2, _, _ in group:
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00001264 if tag != 'insert':
1265 for line in a[i1:i2]:
1266 yield prefixmap[tag] + line
Raymond Hettinger7f2d3022003-06-08 19:38:42 +00001267
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00001268 if group[-1][4] - group[0][3] >= 2:
1269 yield '--- %d,%d ----%s' % (group[0][3]+1, group[-1][4], lineterm)
1270 else:
1271 yield '--- %d ----%s' % (group[-1][4], lineterm)
Raymond Hettinger7f2d3022003-06-08 19:38:42 +00001272 visiblechanges = [e for e in group if e[0] in ('replace', 'insert')]
1273 if visiblechanges:
1274 for tag, _, _, j1, j2 in group:
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00001275 if tag != 'delete':
1276 for line in b[j1:j2]:
1277 yield prefixmap[tag] + line
1278
Tim Peters81b92512002-04-29 01:37:32 +00001279def ndiff(a, b, linejunk=None, charjunk=IS_CHARACTER_JUNK):
Tim Peters5e824c32001-08-12 22:25:01 +00001280 r"""
1281 Compare `a` and `b` (lists of strings); return a `Differ`-style delta.
1282
1283 Optional keyword parameters `linejunk` and `charjunk` are for filter
1284 functions (or None):
1285
1286 - linejunk: A function that should accept a single string argument, and
Tim Peters81b92512002-04-29 01:37:32 +00001287 return true iff the string is junk. The default is None, and is
1288 recommended; as of Python 2.3, an adaptive notion of "noise" lines is
1289 used that does a good job on its own.
Tim Peters5e824c32001-08-12 22:25:01 +00001290
1291 - charjunk: A function that should accept a string of length 1. The
1292 default is module-level function IS_CHARACTER_JUNK, which filters out
1293 whitespace characters (a blank or tab; note: bad idea to include newline
1294 in this!).
1295
1296 Tools/scripts/ndiff.py is a command-line front-end to this function.
1297
1298 Example:
1299
1300 >>> diff = ndiff('one\ntwo\nthree\n'.splitlines(1),
1301 ... 'ore\ntree\nemu\n'.splitlines(1))
1302 >>> print ''.join(diff),
1303 - one
1304 ? ^
1305 + ore
1306 ? ^
1307 - two
1308 - three
1309 ? -
1310 + tree
1311 + emu
1312 """
1313 return Differ(linejunk, charjunk).compare(a, b)
1314
Martin v. Löwise064b412004-08-29 16:34:40 +00001315def _mdiff(fromlines, tolines, context=None, linejunk=None,
1316 charjunk=IS_CHARACTER_JUNK):
Andrew M. Kuchling88268042007-01-05 14:22:17 +00001317 r"""Returns generator yielding marked up from/to side by side differences.
Martin v. Löwise064b412004-08-29 16:34:40 +00001318
1319 Arguments:
1320 fromlines -- list of text lines to compared to tolines
1321 tolines -- list of text lines to be compared to fromlines
1322 context -- number of context lines to display on each side of difference,
1323 if None, all from/to text lines will be generated.
1324 linejunk -- passed on to ndiff (see ndiff documentation)
1325 charjunk -- passed on to ndiff (see ndiff documentation)
Tim Peters48bd7f32004-08-29 22:38:38 +00001326
Martin v. Löwise064b412004-08-29 16:34:40 +00001327 This function returns an interator which returns a tuple:
1328 (from line tuple, to line tuple, boolean flag)
1329
1330 from/to line tuple -- (line num, line text)
1331 line num -- integer or None (to indicate a context seperation)
1332 line text -- original line text with following markers inserted:
1333 '\0+' -- marks start of added text
1334 '\0-' -- marks start of deleted text
1335 '\0^' -- marks start of changed text
1336 '\1' -- marks end of added/deleted/changed text
Tim Peters48bd7f32004-08-29 22:38:38 +00001337
Martin v. Löwise064b412004-08-29 16:34:40 +00001338 boolean flag -- None indicates context separation, True indicates
1339 either "from" or "to" line contains a change, otherwise False.
1340
1341 This function/iterator was originally developed to generate side by side
1342 file difference for making HTML pages (see HtmlDiff class for example
1343 usage).
1344
1345 Note, this function utilizes the ndiff function to generate the side by
1346 side difference markup. Optional ndiff arguments may be passed to this
Tim Peters48bd7f32004-08-29 22:38:38 +00001347 function and they in turn will be passed to ndiff.
Martin v. Löwise064b412004-08-29 16:34:40 +00001348 """
Tim Peters48bd7f32004-08-29 22:38:38 +00001349 import re
Martin v. Löwise064b412004-08-29 16:34:40 +00001350
1351 # regular expression for finding intraline change indices
1352 change_re = re.compile('(\++|\-+|\^+)')
Tim Peters48bd7f32004-08-29 22:38:38 +00001353
Martin v. Löwise064b412004-08-29 16:34:40 +00001354 # create the difference iterator to generate the differences
1355 diff_lines_iterator = ndiff(fromlines,tolines,linejunk,charjunk)
1356
1357 def _make_line(lines, format_key, side, num_lines=[0,0]):
1358 """Returns line of text with user's change markup and line formatting.
1359
1360 lines -- list of lines from the ndiff generator to produce a line of
1361 text from. When producing the line of text to return, the
1362 lines used are removed from this list.
1363 format_key -- '+' return first line in list with "add" markup around
1364 the entire line.
1365 '-' return first line in list with "delete" markup around
1366 the entire line.
1367 '?' return first line in list with add/delete/change
1368 intraline markup (indices obtained from second line)
1369 None return first line in list with no markup
1370 side -- indice into the num_lines list (0=from,1=to)
1371 num_lines -- from/to current line number. This is NOT intended to be a
1372 passed parameter. It is present as a keyword argument to
1373 maintain memory of the current line numbers between calls
1374 of this function.
1375
1376 Note, this function is purposefully not defined at the module scope so
1377 that data it needs from its parent function (within whose context it
1378 is defined) does not need to be of module scope.
1379 """
1380 num_lines[side] += 1
1381 # Handle case where no user markup is to be added, just return line of
1382 # text with user's line format to allow for usage of the line number.
1383 if format_key is None:
1384 return (num_lines[side],lines.pop(0)[2:])
1385 # Handle case of intraline changes
1386 if format_key == '?':
1387 text, markers = lines.pop(0), lines.pop(0)
1388 # find intraline changes (store change type and indices in tuples)
1389 sub_info = []
1390 def record_sub_info(match_object,sub_info=sub_info):
1391 sub_info.append([match_object.group(1)[0],match_object.span()])
1392 return match_object.group(1)
1393 change_re.sub(record_sub_info,markers)
1394 # process each tuple inserting our special marks that won't be
1395 # noticed by an xml/html escaper.
1396 for key,(begin,end) in sub_info[::-1]:
1397 text = text[0:begin]+'\0'+key+text[begin:end]+'\1'+text[end:]
1398 text = text[2:]
1399 # Handle case of add/delete entire line
1400 else:
1401 text = lines.pop(0)[2:]
1402 # if line of text is just a newline, insert a space so there is
1403 # something for the user to highlight and see.
Tim Peters0ca0c642004-11-12 16:12:15 +00001404 if not text:
1405 text = ' '
Martin v. Löwise064b412004-08-29 16:34:40 +00001406 # insert marks that won't be noticed by an xml/html escaper.
1407 text = '\0' + format_key + text + '\1'
Georg Brandl7eb4b7d2005-07-22 21:49:32 +00001408 # Return line of text, first allow user's line formatter to do its
Martin v. Löwise064b412004-08-29 16:34:40 +00001409 # thing (such as adding the line number) then replace the special
1410 # marks with what the user's change markup.
1411 return (num_lines[side],text)
Tim Peters48bd7f32004-08-29 22:38:38 +00001412
Martin v. Löwise064b412004-08-29 16:34:40 +00001413 def _line_iterator():
1414 """Yields from/to lines of text with a change indication.
1415
1416 This function is an iterator. It itself pulls lines from a
1417 differencing iterator, processes them and yields them. When it can
1418 it yields both a "from" and a "to" line, otherwise it will yield one
1419 or the other. In addition to yielding the lines of from/to text, a
1420 boolean flag is yielded to indicate if the text line(s) have
1421 differences in them.
1422
1423 Note, this function is purposefully not defined at the module scope so
1424 that data it needs from its parent function (within whose context it
1425 is defined) does not need to be of module scope.
1426 """
1427 lines = []
1428 num_blanks_pending, num_blanks_to_yield = 0, 0
Tim Peters48bd7f32004-08-29 22:38:38 +00001429 while True:
Martin v. Löwise064b412004-08-29 16:34:40 +00001430 # Load up next 4 lines so we can look ahead, create strings which
1431 # are a concatenation of the first character of each of the 4 lines
1432 # so we can do some very readable comparisons.
1433 while len(lines) < 4:
1434 try:
1435 lines.append(diff_lines_iterator.next())
1436 except StopIteration:
1437 lines.append('X')
1438 s = ''.join([line[0] for line in lines])
1439 if s.startswith('X'):
1440 # When no more lines, pump out any remaining blank lines so the
1441 # corresponding add/delete lines get a matching blank line so
1442 # all line pairs get yielded at the next level.
1443 num_blanks_to_yield = num_blanks_pending
1444 elif s.startswith('-?+?'):
1445 # simple intraline change
1446 yield _make_line(lines,'?',0), _make_line(lines,'?',1), True
1447 continue
1448 elif s.startswith('--++'):
1449 # in delete block, add block coming: we do NOT want to get
1450 # caught up on blank lines yet, just process the delete line
1451 num_blanks_pending -= 1
1452 yield _make_line(lines,'-',0), None, True
1453 continue
Georg Brandlb2afe852006-06-09 20:43:48 +00001454 elif s.startswith(('--?+', '--+', '- ')):
Martin v. Löwise064b412004-08-29 16:34:40 +00001455 # in delete block and see a intraline change or unchanged line
1456 # coming: yield the delete line and then blanks
1457 from_line,to_line = _make_line(lines,'-',0), None
1458 num_blanks_to_yield,num_blanks_pending = num_blanks_pending-1,0
1459 elif s.startswith('-+?'):
1460 # intraline change
1461 yield _make_line(lines,None,0), _make_line(lines,'?',1), True
1462 continue
1463 elif s.startswith('-?+'):
1464 # intraline change
1465 yield _make_line(lines,'?',0), _make_line(lines,None,1), True
1466 continue
1467 elif s.startswith('-'):
1468 # delete FROM line
1469 num_blanks_pending -= 1
1470 yield _make_line(lines,'-',0), None, True
1471 continue
1472 elif s.startswith('+--'):
1473 # in add block, delete block coming: we do NOT want to get
1474 # caught up on blank lines yet, just process the add line
1475 num_blanks_pending += 1
1476 yield None, _make_line(lines,'+',1), True
1477 continue
Georg Brandlb2afe852006-06-09 20:43:48 +00001478 elif s.startswith(('+ ', '+-')):
Martin v. Löwise064b412004-08-29 16:34:40 +00001479 # will be leaving an add block: yield blanks then add line
1480 from_line, to_line = None, _make_line(lines,'+',1)
1481 num_blanks_to_yield,num_blanks_pending = num_blanks_pending+1,0
1482 elif s.startswith('+'):
1483 # inside an add block, yield the add line
1484 num_blanks_pending += 1
1485 yield None, _make_line(lines,'+',1), True
1486 continue
1487 elif s.startswith(' '):
1488 # unchanged text, yield it to both sides
1489 yield _make_line(lines[:],None,0),_make_line(lines,None,1),False
1490 continue
1491 # Catch up on the blank lines so when we yield the next from/to
1492 # pair, they are lined up.
1493 while(num_blanks_to_yield < 0):
1494 num_blanks_to_yield += 1
1495 yield None,('','\n'),True
1496 while(num_blanks_to_yield > 0):
1497 num_blanks_to_yield -= 1
1498 yield ('','\n'),None,True
1499 if s.startswith('X'):
1500 raise StopIteration
1501 else:
1502 yield from_line,to_line,True
1503
1504 def _line_pair_iterator():
1505 """Yields from/to lines of text with a change indication.
1506
1507 This function is an iterator. It itself pulls lines from the line
Georg Brandl7eb4b7d2005-07-22 21:49:32 +00001508 iterator. Its difference from that iterator is that this function
Martin v. Löwise064b412004-08-29 16:34:40 +00001509 always yields a pair of from/to text lines (with the change
1510 indication). If necessary it will collect single from/to lines
1511 until it has a matching pair from/to pair to yield.
1512
1513 Note, this function is purposefully not defined at the module scope so
1514 that data it needs from its parent function (within whose context it
1515 is defined) does not need to be of module scope.
1516 """
1517 line_iterator = _line_iterator()
1518 fromlines,tolines=[],[]
1519 while True:
1520 # Collecting lines of text until we have a from/to pair
1521 while (len(fromlines)==0 or len(tolines)==0):
1522 from_line, to_line, found_diff =line_iterator.next()
1523 if from_line is not None:
1524 fromlines.append((from_line,found_diff))
1525 if to_line is not None:
1526 tolines.append((to_line,found_diff))
1527 # Once we have a pair, remove them from the collection and yield it
1528 from_line, fromDiff = fromlines.pop(0)
1529 to_line, to_diff = tolines.pop(0)
1530 yield (from_line,to_line,fromDiff or to_diff)
1531
1532 # Handle case where user does not want context differencing, just yield
1533 # them up without doing anything else with them.
1534 line_pair_iterator = _line_pair_iterator()
1535 if context is None:
1536 while True:
1537 yield line_pair_iterator.next()
1538 # Handle case where user wants context differencing. We must do some
1539 # storage of lines until we know for sure that they are to be yielded.
1540 else:
1541 context += 1
1542 lines_to_write = 0
1543 while True:
1544 # Store lines up until we find a difference, note use of a
1545 # circular queue because we only need to keep around what
1546 # we need for context.
1547 index, contextLines = 0, [None]*(context)
1548 found_diff = False
1549 while(found_diff is False):
1550 from_line, to_line, found_diff = line_pair_iterator.next()
1551 i = index % context
1552 contextLines[i] = (from_line, to_line, found_diff)
1553 index += 1
1554 # Yield lines that we have collected so far, but first yield
1555 # the user's separator.
1556 if index > context:
1557 yield None, None, None
1558 lines_to_write = context
1559 else:
1560 lines_to_write = index
1561 index = 0
1562 while(lines_to_write):
1563 i = index % context
1564 index += 1
1565 yield contextLines[i]
1566 lines_to_write -= 1
1567 # Now yield the context lines after the change
1568 lines_to_write = context-1
1569 while(lines_to_write):
1570 from_line, to_line, found_diff = line_pair_iterator.next()
1571 # If another change within the context, extend the context
1572 if found_diff:
1573 lines_to_write = context-1
1574 else:
1575 lines_to_write -= 1
1576 yield from_line, to_line, found_diff
1577
1578
1579_file_template = """
1580<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
1581 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
1582
1583<html>
1584
1585<head>
Tim Peters48bd7f32004-08-29 22:38:38 +00001586 <meta http-equiv="Content-Type"
Martin v. Löwise064b412004-08-29 16:34:40 +00001587 content="text/html; charset=ISO-8859-1" />
1588 <title></title>
1589 <style type="text/css">%(styles)s
1590 </style>
1591</head>
1592
1593<body>
1594 %(table)s%(legend)s
1595</body>
1596
1597</html>"""
1598
1599_styles = """
1600 table.diff {font-family:Courier; border:medium;}
1601 .diff_header {background-color:#e0e0e0}
1602 td.diff_header {text-align:right}
1603 .diff_next {background-color:#c0c0c0}
1604 .diff_add {background-color:#aaffaa}
1605 .diff_chg {background-color:#ffff77}
1606 .diff_sub {background-color:#ffaaaa}"""
1607
1608_table_template = """
Tim Peters48bd7f32004-08-29 22:38:38 +00001609 <table class="diff" id="difflib_chg_%(prefix)s_top"
1610 cellspacing="0" cellpadding="0" rules="groups" >
1611 <colgroup></colgroup> <colgroup></colgroup> <colgroup></colgroup>
Martin v. Löwise064b412004-08-29 16:34:40 +00001612 <colgroup></colgroup> <colgroup></colgroup> <colgroup></colgroup>
1613 %(header_row)s
1614 <tbody>
1615%(data_rows)s </tbody>
1616 </table>"""
1617
1618_legend = """
1619 <table class="diff" summary="Legends">
1620 <tr> <th colspan="2"> Legends </th> </tr>
1621 <tr> <td> <table border="" summary="Colors">
1622 <tr><th> Colors </th> </tr>
1623 <tr><td class="diff_add">&nbsp;Added&nbsp;</td></tr>
1624 <tr><td class="diff_chg">Changed</td> </tr>
1625 <tr><td class="diff_sub">Deleted</td> </tr>
1626 </table></td>
1627 <td> <table border="" summary="Links">
1628 <tr><th colspan="2"> Links </th> </tr>
1629 <tr><td>(f)irst change</td> </tr>
1630 <tr><td>(n)ext change</td> </tr>
1631 <tr><td>(t)op</td> </tr>
1632 </table></td> </tr>
1633 </table>"""
1634
1635class HtmlDiff(object):
1636 """For producing HTML side by side comparison with change highlights.
1637
1638 This class can be used to create an HTML table (or a complete HTML file
Andrew M. Kuchling55be9ea2004-09-10 12:59:54 +00001639 containing the table) showing a side by side, line by line comparison
Tim Peters48bd7f32004-08-29 22:38:38 +00001640 of text with inter-line and intra-line change highlights. The table can
Martin v. Löwise064b412004-08-29 16:34:40 +00001641 be generated in either full or contextual difference mode.
Tim Peters48bd7f32004-08-29 22:38:38 +00001642
Martin v. Löwise064b412004-08-29 16:34:40 +00001643 The following methods are provided for HTML generation:
1644
1645 make_table -- generates HTML for a single side by side table
1646 make_file -- generates complete HTML file with a single side by side table
1647
Tim Peters48bd7f32004-08-29 22:38:38 +00001648 See tools/scripts/diff.py for an example usage of this class.
Martin v. Löwise064b412004-08-29 16:34:40 +00001649 """
1650
1651 _file_template = _file_template
1652 _styles = _styles
1653 _table_template = _table_template
1654 _legend = _legend
1655 _default_prefix = 0
Tim Peters48bd7f32004-08-29 22:38:38 +00001656
Martin v. Löwise064b412004-08-29 16:34:40 +00001657 def __init__(self,tabsize=8,wrapcolumn=None,linejunk=None,
1658 charjunk=IS_CHARACTER_JUNK):
1659 """HtmlDiff instance initializer
1660
1661 Arguments:
1662 tabsize -- tab stop spacing, defaults to 8.
1663 wrapcolumn -- column number where lines are broken and wrapped,
1664 defaults to None where lines are not wrapped.
1665 linejunk,charjunk -- keyword arguments passed into ndiff() (used to by
Tim Peters48bd7f32004-08-29 22:38:38 +00001666 HtmlDiff() to generate the side by side HTML differences). See
Martin v. Löwise064b412004-08-29 16:34:40 +00001667 ndiff() documentation for argument default values and descriptions.
1668 """
1669 self._tabsize = tabsize
1670 self._wrapcolumn = wrapcolumn
1671 self._linejunk = linejunk
1672 self._charjunk = charjunk
1673
1674 def make_file(self,fromlines,tolines,fromdesc='',todesc='',context=False,
1675 numlines=5):
1676 """Returns HTML file of side by side comparison with change highlights
1677
1678 Arguments:
1679 fromlines -- list of "from" lines
1680 tolines -- list of "to" lines
1681 fromdesc -- "from" file column header string
1682 todesc -- "to" file column header string
1683 context -- set to True for contextual differences (defaults to False
1684 which shows full differences).
1685 numlines -- number of context lines. When context is set True,
1686 controls number of lines displayed before and after the change.
1687 When context is False, controls the number of lines to place
1688 the "next" link anchors before the next change (so click of
1689 "next" link jumps to just before the change).
1690 """
Tim Peters48bd7f32004-08-29 22:38:38 +00001691
Martin v. Löwise064b412004-08-29 16:34:40 +00001692 return self._file_template % dict(
1693 styles = self._styles,
1694 legend = self._legend,
1695 table = self.make_table(fromlines,tolines,fromdesc,todesc,
1696 context=context,numlines=numlines))
Tim Peters48bd7f32004-08-29 22:38:38 +00001697
Martin v. Löwise064b412004-08-29 16:34:40 +00001698 def _tab_newline_replace(self,fromlines,tolines):
1699 """Returns from/to line lists with tabs expanded and newlines removed.
1700
1701 Instead of tab characters being replaced by the number of spaces
1702 needed to fill in to the next tab stop, this function will fill
1703 the space with tab characters. This is done so that the difference
1704 algorithms can identify changes in a file when tabs are replaced by
1705 spaces and vice versa. At the end of the HTML generation, the tab
1706 characters will be replaced with a nonbreakable space.
1707 """
1708 def expand_tabs(line):
1709 # hide real spaces
1710 line = line.replace(' ','\0')
1711 # expand tabs into spaces
1712 line = line.expandtabs(self._tabsize)
1713 # relace spaces from expanded tabs back into tab characters
1714 # (we'll replace them with markup after we do differencing)
1715 line = line.replace(' ','\t')
1716 return line.replace('\0',' ').rstrip('\n')
1717 fromlines = [expand_tabs(line) for line in fromlines]
1718 tolines = [expand_tabs(line) for line in tolines]
1719 return fromlines,tolines
1720
1721 def _split_line(self,data_list,line_num,text):
1722 """Builds list of text lines by splitting text lines at wrap point
1723
1724 This function will determine if the input text line needs to be
1725 wrapped (split) into separate lines. If so, the first wrap point
1726 will be determined and the first line appended to the output
1727 text line list. This function is used recursively to handle
1728 the second part of the split line to further split it.
1729 """
1730 # if blank line or context separator, just add it to the output list
1731 if not line_num:
1732 data_list.append((line_num,text))
1733 return
1734
1735 # if line text doesn't need wrapping, just add it to the output list
1736 size = len(text)
1737 max = self._wrapcolumn
1738 if (size <= max) or ((size -(text.count('\0')*3)) <= max):
1739 data_list.append((line_num,text))
1740 return
1741
1742 # scan text looking for the wrap point, keeping track if the wrap
1743 # point is inside markers
1744 i = 0
1745 n = 0
1746 mark = ''
1747 while n < max and i < size:
1748 if text[i] == '\0':
1749 i += 1
1750 mark = text[i]
1751 i += 1
1752 elif text[i] == '\1':
1753 i += 1
1754 mark = ''
1755 else:
1756 i += 1
1757 n += 1
1758
1759 # wrap point is inside text, break it up into separate lines
1760 line1 = text[:i]
1761 line2 = text[i:]
1762
1763 # if wrap point is inside markers, place end marker at end of first
1764 # line and start marker at beginning of second line because each
1765 # line will have its own table tag markup around it.
1766 if mark:
1767 line1 = line1 + '\1'
1768 line2 = '\0' + mark + line2
1769
Tim Peters48bd7f32004-08-29 22:38:38 +00001770 # tack on first line onto the output list
Martin v. Löwise064b412004-08-29 16:34:40 +00001771 data_list.append((line_num,line1))
1772
Tim Peters48bd7f32004-08-29 22:38:38 +00001773 # use this routine again to wrap the remaining text
Martin v. Löwise064b412004-08-29 16:34:40 +00001774 self._split_line(data_list,'>',line2)
1775
1776 def _line_wrapper(self,diffs):
1777 """Returns iterator that splits (wraps) mdiff text lines"""
1778
1779 # pull from/to data and flags from mdiff iterator
1780 for fromdata,todata,flag in diffs:
1781 # check for context separators and pass them through
1782 if flag is None:
1783 yield fromdata,todata,flag
1784 continue
1785 (fromline,fromtext),(toline,totext) = fromdata,todata
1786 # for each from/to line split it at the wrap column to form
1787 # list of text lines.
1788 fromlist,tolist = [],[]
1789 self._split_line(fromlist,fromline,fromtext)
1790 self._split_line(tolist,toline,totext)
1791 # yield from/to line in pairs inserting blank lines as
1792 # necessary when one side has more wrapped lines
1793 while fromlist or tolist:
1794 if fromlist:
1795 fromdata = fromlist.pop(0)
1796 else:
1797 fromdata = ('',' ')
1798 if tolist:
1799 todata = tolist.pop(0)
1800 else:
1801 todata = ('',' ')
1802 yield fromdata,todata,flag
1803
1804 def _collect_lines(self,diffs):
1805 """Collects mdiff output into separate lists
1806
1807 Before storing the mdiff from/to data into a list, it is converted
1808 into a single line of text with HTML markup.
1809 """
1810
1811 fromlist,tolist,flaglist = [],[],[]
Tim Peters48bd7f32004-08-29 22:38:38 +00001812 # pull from/to data and flags from mdiff style iterator
Martin v. Löwise064b412004-08-29 16:34:40 +00001813 for fromdata,todata,flag in diffs:
1814 try:
1815 # store HTML markup of the lines into the lists
1816 fromlist.append(self._format_line(0,flag,*fromdata))
1817 tolist.append(self._format_line(1,flag,*todata))
1818 except TypeError:
1819 # exceptions occur for lines where context separators go
1820 fromlist.append(None)
1821 tolist.append(None)
1822 flaglist.append(flag)
1823 return fromlist,tolist,flaglist
Tim Peters48bd7f32004-08-29 22:38:38 +00001824
Martin v. Löwise064b412004-08-29 16:34:40 +00001825 def _format_line(self,side,flag,linenum,text):
1826 """Returns HTML markup of "from" / "to" text lines
1827
1828 side -- 0 or 1 indicating "from" or "to" text
1829 flag -- indicates if difference on line
1830 linenum -- line number (used for line number column)
1831 text -- line text to be marked up
1832 """
1833 try:
1834 linenum = '%d' % linenum
1835 id = ' id="%s%s"' % (self._prefix[side],linenum)
1836 except TypeError:
1837 # handle blank lines where linenum is '>' or ''
Tim Peters48bd7f32004-08-29 22:38:38 +00001838 id = ''
Martin v. Löwise064b412004-08-29 16:34:40 +00001839 # replace those things that would get confused with HTML symbols
1840 text=text.replace("&","&amp;").replace(">","&gt;").replace("<","&lt;")
1841
1842 # make space non-breakable so they don't get compressed or line wrapped
1843 text = text.replace(' ','&nbsp;').rstrip()
1844
1845 return '<td class="diff_header"%s>%s</td><td nowrap="nowrap">%s</td>' \
1846 % (id,linenum,text)
1847
1848 def _make_prefix(self):
1849 """Create unique anchor prefixes"""
1850
1851 # Generate a unique anchor prefix so multiple tables
1852 # can exist on the same HTML page without conflicts.
1853 fromprefix = "from%d_" % HtmlDiff._default_prefix
1854 toprefix = "to%d_" % HtmlDiff._default_prefix
1855 HtmlDiff._default_prefix += 1
1856 # store prefixes so line format method has access
1857 self._prefix = [fromprefix,toprefix]
1858
1859 def _convert_flags(self,fromlist,tolist,flaglist,context,numlines):
1860 """Makes list of "next" links"""
Tim Peters48bd7f32004-08-29 22:38:38 +00001861
Martin v. Löwise064b412004-08-29 16:34:40 +00001862 # all anchor names will be generated using the unique "to" prefix
1863 toprefix = self._prefix[1]
Tim Peters48bd7f32004-08-29 22:38:38 +00001864
Martin v. Löwise064b412004-08-29 16:34:40 +00001865 # process change flags, generating middle column of next anchors/links
1866 next_id = ['']*len(flaglist)
1867 next_href = ['']*len(flaglist)
1868 num_chg, in_change = 0, False
1869 last = 0
1870 for i,flag in enumerate(flaglist):
1871 if flag:
1872 if not in_change:
1873 in_change = True
1874 last = i
1875 # at the beginning of a change, drop an anchor a few lines
Tim Peters48bd7f32004-08-29 22:38:38 +00001876 # (the context lines) before the change for the previous
Martin v. Löwise064b412004-08-29 16:34:40 +00001877 # link
1878 i = max([0,i-numlines])
1879 next_id[i] = ' id="difflib_chg_%s_%d"' % (toprefix,num_chg)
Tim Peters48bd7f32004-08-29 22:38:38 +00001880 # at the beginning of a change, drop a link to the next
Martin v. Löwise064b412004-08-29 16:34:40 +00001881 # change
1882 num_chg += 1
1883 next_href[last] = '<a href="#difflib_chg_%s_%d">n</a>' % (
1884 toprefix,num_chg)
1885 else:
1886 in_change = False
1887 # check for cases where there is no content to avoid exceptions
1888 if not flaglist:
1889 flaglist = [False]
1890 next_id = ['']
1891 next_href = ['']
1892 last = 0
1893 if context:
1894 fromlist = ['<td></td><td>&nbsp;No Differences Found&nbsp;</td>']
1895 tolist = fromlist
1896 else:
1897 fromlist = tolist = ['<td></td><td>&nbsp;Empty File&nbsp;</td>']
1898 # if not a change on first line, drop a link
1899 if not flaglist[0]:
1900 next_href[0] = '<a href="#difflib_chg_%s_0">f</a>' % toprefix
1901 # redo the last link to link to the top
1902 next_href[last] = '<a href="#difflib_chg_%s_top">t</a>' % (toprefix)
1903
1904 return fromlist,tolist,flaglist,next_href,next_id
1905
1906 def make_table(self,fromlines,tolines,fromdesc='',todesc='',context=False,
1907 numlines=5):
1908 """Returns HTML table of side by side comparison with change highlights
1909
1910 Arguments:
1911 fromlines -- list of "from" lines
1912 tolines -- list of "to" lines
1913 fromdesc -- "from" file column header string
1914 todesc -- "to" file column header string
1915 context -- set to True for contextual differences (defaults to False
1916 which shows full differences).
1917 numlines -- number of context lines. When context is set True,
1918 controls number of lines displayed before and after the change.
1919 When context is False, controls the number of lines to place
1920 the "next" link anchors before the next change (so click of
1921 "next" link jumps to just before the change).
1922 """
1923
1924 # make unique anchor prefixes so that multiple tables may exist
1925 # on the same page without conflict.
1926 self._make_prefix()
Tim Peters48bd7f32004-08-29 22:38:38 +00001927
Martin v. Löwise064b412004-08-29 16:34:40 +00001928 # change tabs to spaces before it gets more difficult after we insert
1929 # markkup
1930 fromlines,tolines = self._tab_newline_replace(fromlines,tolines)
Tim Peters48bd7f32004-08-29 22:38:38 +00001931
Martin v. Löwise064b412004-08-29 16:34:40 +00001932 # create diffs iterator which generates side by side from/to data
1933 if context:
1934 context_lines = numlines
1935 else:
1936 context_lines = None
1937 diffs = _mdiff(fromlines,tolines,context_lines,linejunk=self._linejunk,
1938 charjunk=self._charjunk)
1939
1940 # set up iterator to wrap lines that exceed desired width
1941 if self._wrapcolumn:
1942 diffs = self._line_wrapper(diffs)
Tim Peters48bd7f32004-08-29 22:38:38 +00001943
Martin v. Löwise064b412004-08-29 16:34:40 +00001944 # collect up from/to lines and flags into lists (also format the lines)
1945 fromlist,tolist,flaglist = self._collect_lines(diffs)
1946
1947 # process change flags, generating middle column of next anchors/links
1948 fromlist,tolist,flaglist,next_href,next_id = self._convert_flags(
1949 fromlist,tolist,flaglist,context,numlines)
1950
Raymond Hettinger0e520b42007-03-08 21:33:47 +00001951 s = []
Martin v. Löwise064b412004-08-29 16:34:40 +00001952 fmt = ' <tr><td class="diff_next"%s>%s</td>%s' + \
1953 '<td class="diff_next">%s</td>%s</tr>\n'
1954 for i in range(len(flaglist)):
1955 if flaglist[i] is None:
1956 # mdiff yields None on separator lines skip the bogus ones
1957 # generated for the first line
1958 if i > 0:
Raymond Hettinger0e520b42007-03-08 21:33:47 +00001959 s.append(' </tbody> \n <tbody>\n')
Martin v. Löwise064b412004-08-29 16:34:40 +00001960 else:
Raymond Hettinger0e520b42007-03-08 21:33:47 +00001961 s.append( fmt % (next_id[i],next_href[i],fromlist[i],
Martin v. Löwise064b412004-08-29 16:34:40 +00001962 next_href[i],tolist[i]))
1963 if fromdesc or todesc:
1964 header_row = '<thead><tr>%s%s%s%s</tr></thead>' % (
1965 '<th class="diff_next"><br /></th>',
1966 '<th colspan="2" class="diff_header">%s</th>' % fromdesc,
1967 '<th class="diff_next"><br /></th>',
1968 '<th colspan="2" class="diff_header">%s</th>' % todesc)
1969 else:
1970 header_row = ''
1971
1972 table = self._table_template % dict(
Raymond Hettinger0e520b42007-03-08 21:33:47 +00001973 data_rows=''.join(s),
Martin v. Löwise064b412004-08-29 16:34:40 +00001974 header_row=header_row,
1975 prefix=self._prefix[1])
1976
1977 return table.replace('\0+','<span class="diff_add">'). \
1978 replace('\0-','<span class="diff_sub">'). \
1979 replace('\0^','<span class="diff_chg">'). \
1980 replace('\1','</span>'). \
1981 replace('\t','&nbsp;')
Tim Peters48bd7f32004-08-29 22:38:38 +00001982
Martin v. Löwise064b412004-08-29 16:34:40 +00001983del re
1984
Tim Peters5e824c32001-08-12 22:25:01 +00001985def restore(delta, which):
1986 r"""
Tim Peters8a9c2842001-09-22 21:30:22 +00001987 Generate one of the two sequences that generated a delta.
Tim Peters5e824c32001-08-12 22:25:01 +00001988
1989 Given a `delta` produced by `Differ.compare()` or `ndiff()`, extract
1990 lines originating from file 1 or 2 (parameter `which`), stripping off line
1991 prefixes.
1992
1993 Examples:
1994
1995 >>> diff = ndiff('one\ntwo\nthree\n'.splitlines(1),
1996 ... 'ore\ntree\nemu\n'.splitlines(1))
Tim Peters8a9c2842001-09-22 21:30:22 +00001997 >>> diff = list(diff)
Tim Peters5e824c32001-08-12 22:25:01 +00001998 >>> print ''.join(restore(diff, 1)),
1999 one
2000 two
2001 three
2002 >>> print ''.join(restore(diff, 2)),
2003 ore
2004 tree
2005 emu
2006 """
2007 try:
2008 tag = {1: "- ", 2: "+ "}[int(which)]
2009 except KeyError:
2010 raise ValueError, ('unknown delta choice (must be 1 or 2): %r'
2011 % which)
2012 prefixes = (" ", tag)
Tim Peters5e824c32001-08-12 22:25:01 +00002013 for line in delta:
2014 if line[:2] in prefixes:
Tim Peters8a9c2842001-09-22 21:30:22 +00002015 yield line[2:]
Tim Peters5e824c32001-08-12 22:25:01 +00002016
Tim Peters9ae21482001-02-10 08:00:53 +00002017def _test():
2018 import doctest, difflib
2019 return doctest.testmod(difflib)
2020
2021if __name__ == "__main__":
2022 _test()