blob: 92d58fab80ae01b4bc8549cabecc0d4b9cbdfd07 [file] [log] [blame]
Benjamin Peterson90f5ba52010-03-11 22:53:45 +00001#! /usr/bin/env python3
Tim Peters9ae21482001-02-10 08:00:53 +00002
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',
Christian Heimes25bb7832008-01-11 16:17:00 +000033 'unified_diff', 'HtmlDiff', 'Match']
Tim Peters5e824c32001-08-12 22:25:01 +000034
Raymond Hettingerbb6b7342004-06-13 09:57:33 +000035import heapq
Christian Heimes25bb7832008-01-11 16:17:00 +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
Guido van Rossumfff80df2007-02-09 20:33:44 +000082 >>> print(round(s.ratio(), 3))
Tim Peters5e824c32001-08-12 22:25:01 +000083 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():
Guido van Rossumfff80df2007-02-09 20:33:44 +000090 ... print("a[%d] and b[%d] match for %d elements" % block)
Tim Peters5e824c32001-08-12 22:25:01 +000091 a[0] and b[0] match for 8 elements
Thomas Wouters0e3f5912006-08-11 14:57:12 +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():
Guido van Rossumfff80df2007-02-09 20:33:44 +0000103 ... print("%6s a[%d:%d] b[%d:%d]" % opcode)
Tim Peters5e824c32001-08-12 22:25:01 +0000104 equal a[0:8] b[0:8]
105 insert a[8:8] b[8:17]
Thomas Wouters0e3f5912006-08-11 14:57:12 +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;
Guido van Rossume2b70bc2006-08-18 22:13:04 +0000205 # it's really the __contains__ method of a hidden dict.
Tim Peters9ae21482001-02-10 08:00:53 +0000206 # 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:
Guido van Rossumcc2b0162007-02-11 06:12:03 +0000337 for elt in list(d.keys()):
Tim Peters81b92512002-04-29 01:37:32 +0000338 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.
Guido van Rossume2b70bc2006-08-18 22:13:04 +0000347 self.isbjunk = junkdict.__contains__
348 self.isbpopular = populardict.__contains__
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)
Christian Heimes25bb7832008-01-11 16:17:00 +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)
Christian Heimes25bb7832008-01-11 16:17:00 +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)
Christian Heimes25bb7832008-01-11 16:17:00 +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 = []
Guido van Rossum805365e2007-05-07 22:24:25 +0000413 for i in range(alo, ahi):
Tim Peters9ae21482001-02-10 08:00:53 +0000414 # 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
Christian Heimes25bb7832008-01-11 16:17:00 +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
Thomas Wouters0e3f5912006-08-11 14:57:12 +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")
Christian Heimes25bb7832008-01-11 16:17:00 +0000475 >>> list(s.get_matching_blocks())
476 [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
Thomas Wouters0e3f5912006-08-11 14:57:12 +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)]
Thomas Wouters0e3f5912006-08-11 14:57:12 +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()
Thomas Wouters0e3f5912006-08-11 14:57:12 +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
Thomas Wouters0e3f5912006-08-11 14:57:12 +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))
Thomas Wouters0e3f5912006-08-11 14:57:12 +0000503 matching_blocks.sort()
Gustavo Niemeyer548148812006-01-31 18:34:13 +0000504
Thomas Wouters0e3f5912006-08-11 14:57:12 +0000505 # 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
515 # block so lengthened remains the block to compare against.
516 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
Christian Heimes25bb7832008-01-11 16:17:00 +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():
Guido van Rossumfff80df2007-02-09 20:33:44 +0000551 ... print(("%7s a[%d:%d] (%s) b[%d:%d] (%s)" %
552 ... (tag, i1, i2, a[i1:i2], j1, j2, b[j1:j2])))
Tim Peters9ae21482001-02-10 08:00:53 +0000553 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
Guido van Rossumc1f779c2007-07-03 08:25:58 +0000593 >>> a = list(map(str, range(1,40)))
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +0000594 >>> 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
Guido van Rossum89da5d72006-08-22 00:21:25 +0000658 matches = sum(triple[-1] for triple in self.get_matching_blocks())
Neal Norwitze7dfe212003-07-01 14:59:46 +0000659 return _calculate_ratio(matches, len(self.a) + len(self.b))
Tim Peters9ae21482001-02-10 08:00:53 +0000660
661 def quick_ratio(self):
662 """Return an upper bound on ratio() relatively quickly.
663
664 This isn't defined beyond that it is an upper bound on .ratio(), and
665 is faster to compute.
666 """
667
668 # viewing a and b as multisets, set matches to the cardinality
669 # of their intersection; this counts the number of matches
670 # without regard to order, so is clearly an upper bound
671 if self.fullbcount is None:
672 self.fullbcount = fullbcount = {}
673 for elt in self.b:
674 fullbcount[elt] = fullbcount.get(elt, 0) + 1
675 fullbcount = self.fullbcount
676 # avail[x] is the number of times x appears in 'b' less the
677 # number of times we've seen it in 'a' so far ... kinda
678 avail = {}
Guido van Rossume2b70bc2006-08-18 22:13:04 +0000679 availhas, matches = avail.__contains__, 0
Tim Peters9ae21482001-02-10 08:00:53 +0000680 for elt in self.a:
681 if availhas(elt):
682 numb = avail[elt]
683 else:
684 numb = fullbcount.get(elt, 0)
685 avail[elt] = numb - 1
686 if numb > 0:
687 matches = matches + 1
Neal Norwitze7dfe212003-07-01 14:59:46 +0000688 return _calculate_ratio(matches, len(self.a) + len(self.b))
Tim Peters9ae21482001-02-10 08:00:53 +0000689
690 def real_quick_ratio(self):
691 """Return an upper bound on ratio() very quickly.
692
693 This isn't defined beyond that it is an upper bound on .ratio(), and
694 is faster to compute than either .ratio() or .quick_ratio().
695 """
696
697 la, lb = len(self.a), len(self.b)
698 # can't have more matches than the number of elements in the
699 # shorter sequence
Neal Norwitze7dfe212003-07-01 14:59:46 +0000700 return _calculate_ratio(min(la, lb), la + lb)
Tim Peters9ae21482001-02-10 08:00:53 +0000701
702def get_close_matches(word, possibilities, n=3, cutoff=0.6):
703 """Use SequenceMatcher to return list of the best "good enough" matches.
704
705 word is a sequence for which close matches are desired (typically a
706 string).
707
708 possibilities is a list of sequences against which to match word
709 (typically a list of strings).
710
711 Optional arg n (default 3) is the maximum number of close matches to
712 return. n must be > 0.
713
714 Optional arg cutoff (default 0.6) is a float in [0, 1]. Possibilities
715 that don't score at least that similar to word are ignored.
716
717 The best (no more than n) matches among the possibilities are returned
718 in a list, sorted by similarity score, most similar first.
719
720 >>> get_close_matches("appel", ["ape", "apple", "peach", "puppy"])
721 ['apple', 'ape']
Tim Peters5e824c32001-08-12 22:25:01 +0000722 >>> import keyword as _keyword
723 >>> get_close_matches("wheel", _keyword.kwlist)
Tim Peters9ae21482001-02-10 08:00:53 +0000724 ['while']
Guido van Rossum486364b2007-06-30 05:01:58 +0000725 >>> get_close_matches("Apple", _keyword.kwlist)
Tim Peters9ae21482001-02-10 08:00:53 +0000726 []
Tim Peters5e824c32001-08-12 22:25:01 +0000727 >>> get_close_matches("accept", _keyword.kwlist)
Tim Peters9ae21482001-02-10 08:00:53 +0000728 ['except']
729 """
730
731 if not n > 0:
Walter Dörwald70a6b492004-02-12 17:35:32 +0000732 raise ValueError("n must be > 0: %r" % (n,))
Tim Peters9ae21482001-02-10 08:00:53 +0000733 if not 0.0 <= cutoff <= 1.0:
Walter Dörwald70a6b492004-02-12 17:35:32 +0000734 raise ValueError("cutoff must be in [0.0, 1.0]: %r" % (cutoff,))
Tim Peters9ae21482001-02-10 08:00:53 +0000735 result = []
736 s = SequenceMatcher()
737 s.set_seq2(word)
738 for x in possibilities:
739 s.set_seq1(x)
740 if s.real_quick_ratio() >= cutoff and \
741 s.quick_ratio() >= cutoff and \
742 s.ratio() >= cutoff:
743 result.append((s.ratio(), x))
Tim Peters9ae21482001-02-10 08:00:53 +0000744
Raymond Hettinger6b59f5f2003-10-16 05:53:16 +0000745 # Move the best scorers to head of list
Raymond Hettingeraefde432004-06-15 23:53:35 +0000746 result = heapq.nlargest(n, result)
Raymond Hettinger6b59f5f2003-10-16 05:53:16 +0000747 # Strip scores for the best n matches
Raymond Hettingerbb6b7342004-06-13 09:57:33 +0000748 return [x for score, x in result]
Tim Peters5e824c32001-08-12 22:25:01 +0000749
750def _count_leading(line, ch):
751 """
752 Return number of `ch` characters at the start of `line`.
753
754 Example:
755
756 >>> _count_leading(' abc', ' ')
757 3
758 """
759
760 i, n = 0, len(line)
761 while i < n and line[i] == ch:
762 i += 1
763 return i
764
765class Differ:
766 r"""
767 Differ is a class for comparing sequences of lines of text, and
768 producing human-readable differences or deltas. Differ uses
769 SequenceMatcher both to compare sequences of lines, and to compare
770 sequences of characters within similar (near-matching) lines.
771
772 Each line of a Differ delta begins with a two-letter code:
773
774 '- ' line unique to sequence 1
775 '+ ' line unique to sequence 2
776 ' ' line common to both sequences
777 '? ' line not present in either input sequence
778
779 Lines beginning with '? ' attempt to guide the eye to intraline
780 differences, and were not present in either input sequence. These lines
781 can be confusing if the sequences contain tab characters.
782
783 Note that Differ makes no claim to produce a *minimal* diff. To the
784 contrary, minimal diffs are often counter-intuitive, because they synch
785 up anywhere possible, sometimes accidental matches 100 pages apart.
786 Restricting synch points to contiguous matches preserves some notion of
787 locality, at the occasional cost of producing a longer diff.
788
789 Example: Comparing two texts.
790
791 First we set up the texts, sequences of individual single-line strings
792 ending with newlines (such sequences can also be obtained from the
793 `readlines()` method of file-like objects):
794
795 >>> text1 = ''' 1. Beautiful is better than ugly.
796 ... 2. Explicit is better than implicit.
797 ... 3. Simple is better than complex.
798 ... 4. Complex is better than complicated.
799 ... '''.splitlines(1)
800 >>> len(text1)
801 4
802 >>> text1[0][-1]
803 '\n'
804 >>> text2 = ''' 1. Beautiful is better than ugly.
805 ... 3. Simple is better than complex.
806 ... 4. Complicated is better than complex.
807 ... 5. Flat is better than nested.
808 ... '''.splitlines(1)
809
810 Next we instantiate a Differ object:
811
812 >>> d = Differ()
813
814 Note that when instantiating a Differ object we may pass functions to
815 filter out line and character 'junk'. See Differ.__init__ for details.
816
817 Finally, we compare the two:
818
Tim Peters8a9c2842001-09-22 21:30:22 +0000819 >>> result = list(d.compare(text1, text2))
Tim Peters5e824c32001-08-12 22:25:01 +0000820
821 'result' is a list of strings, so let's pretty-print it:
822
823 >>> from pprint import pprint as _pprint
824 >>> _pprint(result)
825 [' 1. Beautiful is better than ugly.\n',
826 '- 2. Explicit is better than implicit.\n',
827 '- 3. Simple is better than complex.\n',
828 '+ 3. Simple is better than complex.\n',
829 '? ++\n',
830 '- 4. Complex is better than complicated.\n',
831 '? ^ ---- ^\n',
832 '+ 4. Complicated is better than complex.\n',
833 '? ++++ ^ ^\n',
834 '+ 5. Flat is better than nested.\n']
835
836 As a single multi-line string it looks like this:
837
Guido van Rossumbe19ed72007-02-09 05:37:30 +0000838 >>> print(''.join(result), end="")
Tim Peters5e824c32001-08-12 22:25:01 +0000839 1. Beautiful is better than ugly.
840 - 2. Explicit is better than implicit.
841 - 3. Simple is better than complex.
842 + 3. Simple is better than complex.
843 ? ++
844 - 4. Complex is better than complicated.
845 ? ^ ---- ^
846 + 4. Complicated is better than complex.
847 ? ++++ ^ ^
848 + 5. Flat is better than nested.
849
850 Methods:
851
852 __init__(linejunk=None, charjunk=None)
853 Construct a text differencer, with optional filters.
854
855 compare(a, b)
Tim Peters8a9c2842001-09-22 21:30:22 +0000856 Compare two sequences of lines; generate the resulting delta.
Tim Peters5e824c32001-08-12 22:25:01 +0000857 """
858
859 def __init__(self, linejunk=None, charjunk=None):
860 """
861 Construct a text differencer, with optional filters.
862
863 The two optional keyword parameters are for filter functions:
864
865 - `linejunk`: A function that should accept a single string argument,
866 and return true iff the string is junk. The module-level function
867 `IS_LINE_JUNK` may be used to filter out lines without visible
Tim Peters81b92512002-04-29 01:37:32 +0000868 characters, except for at most one splat ('#'). It is recommended
869 to leave linejunk None; as of Python 2.3, the underlying
870 SequenceMatcher class has grown an adaptive notion of "noise" lines
871 that's better than any static definition the author has ever been
872 able to craft.
Tim Peters5e824c32001-08-12 22:25:01 +0000873
874 - `charjunk`: A function that should accept a string of length 1. The
875 module-level function `IS_CHARACTER_JUNK` may be used to filter out
876 whitespace characters (a blank or tab; **note**: bad idea to include
Tim Peters81b92512002-04-29 01:37:32 +0000877 newline in this!). Use of IS_CHARACTER_JUNK is recommended.
Tim Peters5e824c32001-08-12 22:25:01 +0000878 """
879
880 self.linejunk = linejunk
881 self.charjunk = charjunk
Tim Peters5e824c32001-08-12 22:25:01 +0000882
883 def compare(self, a, b):
884 r"""
Tim Peters8a9c2842001-09-22 21:30:22 +0000885 Compare two sequences of lines; generate the resulting delta.
Tim Peters5e824c32001-08-12 22:25:01 +0000886
887 Each sequence must contain individual single-line strings ending with
888 newlines. Such sequences can be obtained from the `readlines()` method
Tim Peters8a9c2842001-09-22 21:30:22 +0000889 of file-like objects. The delta generated also consists of newline-
890 terminated strings, ready to be printed as-is via the writeline()
Tim Peters5e824c32001-08-12 22:25:01 +0000891 method of a file-like object.
892
893 Example:
894
Guido van Rossumbe19ed72007-02-09 05:37:30 +0000895 >>> print(''.join(Differ().compare('one\ntwo\nthree\n'.splitlines(1),
Tim Peters5e824c32001-08-12 22:25:01 +0000896 ... 'ore\ntree\nemu\n'.splitlines(1))),
Guido van Rossumbe19ed72007-02-09 05:37:30 +0000897 ... end="")
Tim Peters5e824c32001-08-12 22:25:01 +0000898 - 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:
Collin Winterce36ad82007-08-30 01:19:48 +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."""
Guido van Rossum805365e2007-05-07 22:24:25 +0000927 for i in range(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)
Guido van Rossumbe19ed72007-02-09 05:37:30 +0000957 >>> print(''.join(results), end="")
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)
Guido van Rossum805365e2007-05-07 22:24:25 +0000973 for j in range(blo, bhi):
Tim Peters5e824c32001-08-12 22:25:01 +0000974 bj = b[j]
975 cruncher.set_seq2(bj)
Guido van Rossum805365e2007-05-07 22:24:25 +0000976 for i in range(alo, ahi):
Tim Peters5e824c32001-08-12 22:25:01 +0000977 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:
Collin Winterce36ad82007-08-30 01:19:48 +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()
Senthil Kumaran758025c2009-11-23 19:02:52 +00001063 >>> results = d._qformat('\tabcDefghiJkl\n', '\tabcdefGhijkl\n',
1064 ... ' ^ ^ ^ ', ' ^ ^ ^ ')
Guido van Rossumfff80df2007-02-09 20:33:44 +00001065 >>> for line in results: print(repr(line))
1066 ...
Tim Peters5e824c32001-08-12 22:25:01 +00001067 '- \tabcDefghiJkl\n'
1068 '? \t ^ ^ ^\n'
Senthil Kumaran758025c2009-11-23 19:02:52 +00001069 '+ \tabcdefGhijkl\n'
1070 '? \t ^ ^ ^\n'
Tim Peters5e824c32001-08-12 22:25:01 +00001071 """
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], " "))
Senthil Kumaran758025c2009-11-23 19:02:52 +00001077 common = min(common, _count_leading(btags[:common], " "))
Tim Peters5e824c32001-08-12 22:25:01 +00001078 atags = atags[common:].rstrip()
1079 btags = btags[common:].rstrip()
1080
Tim Peters8a9c2842001-09-22 21:30:22 +00001081 yield "- " + aline
Tim Peters5e824c32001-08-12 22:25:01 +00001082 if atags:
Tim Peters527e64f2001-10-04 05:36:56 +00001083 yield "? %s%s\n" % ("\t" * common, atags)
Tim Peters5e824c32001-08-12 22:25:01 +00001084
Tim Peters8a9c2842001-09-22 21:30:22 +00001085 yield "+ " + bline
Tim Peters5e824c32001-08-12 22:25:01 +00001086 if btags:
Tim Peters8a9c2842001-09-22 21:30:22 +00001087 yield "? %s%s\n" % ("\t" * common, btags)
Tim Peters5e824c32001-08-12 22:25:01 +00001088
1089# With respect to junk, an earlier version of ndiff simply refused to
1090# *start* a match with a junk element. The result was cases like this:
1091# before: private Thread currentThread;
1092# after: private volatile Thread currentThread;
1093# If you consider whitespace to be junk, the longest contiguous match
1094# not starting with junk is "e Thread currentThread". So ndiff reported
1095# that "e volatil" was inserted between the 't' and the 'e' in "private".
1096# While an accurate view, to people that's absurd. The current version
1097# looks for matching blocks that are entirely junk-free, then extends the
1098# longest one of those as far as possible but only with matching junk.
1099# So now "currentThread" is matched, then extended to suck up the
1100# preceding blank; then "private" is matched, and extended to suck up the
1101# following blank; then "Thread" is matched; and finally ndiff reports
1102# that "volatile " was inserted before "Thread". The only quibble
1103# remaining is that perhaps it was really the case that " volatile"
1104# was inserted after "private". I can live with that <wink>.
1105
1106import re
1107
1108def IS_LINE_JUNK(line, pat=re.compile(r"\s*#?\s*$").match):
1109 r"""
1110 Return 1 for ignorable line: iff `line` is blank or contains a single '#'.
1111
1112 Examples:
1113
1114 >>> IS_LINE_JUNK('\n')
Guido van Rossum77f6a652002-04-03 22:41:51 +00001115 True
Tim Peters5e824c32001-08-12 22:25:01 +00001116 >>> IS_LINE_JUNK(' # \n')
Guido van Rossum77f6a652002-04-03 22:41:51 +00001117 True
Tim Peters5e824c32001-08-12 22:25:01 +00001118 >>> IS_LINE_JUNK('hello\n')
Guido van Rossum77f6a652002-04-03 22:41:51 +00001119 False
Tim Peters5e824c32001-08-12 22:25:01 +00001120 """
1121
1122 return pat(line) is not None
1123
1124def IS_CHARACTER_JUNK(ch, ws=" \t"):
1125 r"""
1126 Return 1 for ignorable character: iff `ch` is a space or tab.
1127
1128 Examples:
1129
1130 >>> IS_CHARACTER_JUNK(' ')
Guido van Rossum77f6a652002-04-03 22:41:51 +00001131 True
Tim Peters5e824c32001-08-12 22:25:01 +00001132 >>> IS_CHARACTER_JUNK('\t')
Guido van Rossum77f6a652002-04-03 22:41:51 +00001133 True
Tim Peters5e824c32001-08-12 22:25:01 +00001134 >>> IS_CHARACTER_JUNK('\n')
Guido van Rossum77f6a652002-04-03 22:41:51 +00001135 False
Tim Peters5e824c32001-08-12 22:25:01 +00001136 >>> IS_CHARACTER_JUNK('x')
Guido van Rossum77f6a652002-04-03 22:41:51 +00001137 False
Tim Peters5e824c32001-08-12 22:25:01 +00001138 """
1139
1140 return ch in ws
1141
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00001142
1143def unified_diff(a, b, fromfile='', tofile='', fromfiledate='',
1144 tofiledate='', n=3, lineterm='\n'):
1145 r"""
1146 Compare two sequences of lines; generate the delta as a unified diff.
1147
1148 Unified diffs are a compact way of showing line changes and a few
1149 lines of context. The number of context lines is set by 'n' which
1150 defaults to three.
1151
Raymond Hettinger0887c732003-06-17 16:53:25 +00001152 By default, the diff control lines (those with ---, +++, or @@) are
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00001153 created with a trailing newline. This is helpful so that inputs
1154 created from file.readlines() result in diffs that are suitable for
1155 file.writelines() since both the inputs and outputs have trailing
1156 newlines.
1157
1158 For inputs that do not have trailing newlines, set the lineterm
1159 argument to "" so that the output will be uniformly newline free.
1160
1161 The unidiff format normally has a header for filenames and modification
1162 times. Any or all of these may be specified using strings for
R. David Murrayb2416e52010-04-12 16:58:02 +00001163 'fromfile', 'tofile', 'fromfiledate', and 'tofiledate'.
1164 The modification times are normally expressed in the ISO 8601 format.
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00001165
1166 Example:
1167
1168 >>> for line in unified_diff('one two three four'.split(),
1169 ... 'zero one tree four'.split(), 'Original', 'Current',
R. David Murrayb2416e52010-04-12 16:58:02 +00001170 ... '2005-01-26 23:30:50', '2010-04-02 10:20:52',
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00001171 ... lineterm=''):
R. David Murrayb2416e52010-04-12 16:58:02 +00001172 ... print(line) # doctest: +NORMALIZE_WHITESPACE
1173 --- Original 2005-01-26 23:30:50
1174 +++ Current 2010-04-02 10:20:52
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00001175 @@ -1,4 +1,4 @@
1176 +zero
1177 one
1178 -two
1179 -three
1180 +tree
1181 four
1182 """
1183
1184 started = False
1185 for group in SequenceMatcher(None,a,b).get_grouped_opcodes(n):
1186 if not started:
R. David Murrayb2416e52010-04-12 16:58:02 +00001187 fromdate = '\t%s' % fromfiledate if fromfiledate else ''
1188 todate = '\t%s' % tofiledate if tofiledate else ''
1189 yield '--- %s%s%s' % (fromfile, fromdate, lineterm)
1190 yield '+++ %s%s%s' % (tofile, todate, lineterm)
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00001191 started = True
1192 i1, i2, j1, j2 = group[0][1], group[-1][2], group[0][3], group[-1][4]
1193 yield "@@ -%d,%d +%d,%d @@%s" % (i1+1, i2-i1, j1+1, j2-j1, lineterm)
1194 for tag, i1, i2, j1, j2 in group:
1195 if tag == 'equal':
1196 for line in a[i1:i2]:
1197 yield ' ' + line
1198 continue
1199 if tag == 'replace' or tag == 'delete':
1200 for line in a[i1:i2]:
1201 yield '-' + line
1202 if tag == 'replace' or tag == 'insert':
1203 for line in b[j1:j2]:
1204 yield '+' + line
1205
1206# See http://www.unix.org/single_unix_specification/
1207def context_diff(a, b, fromfile='', tofile='',
1208 fromfiledate='', tofiledate='', n=3, lineterm='\n'):
1209 r"""
1210 Compare two sequences of lines; generate the delta as a context diff.
1211
1212 Context diffs are a compact way of showing line changes and a few
1213 lines of context. The number of context lines is set by 'n' which
1214 defaults to three.
1215
1216 By default, the diff control lines (those with *** or ---) are
1217 created with a trailing newline. This is helpful so that inputs
1218 created from file.readlines() result in diffs that are suitable for
1219 file.writelines() since both the inputs and outputs have trailing
1220 newlines.
1221
1222 For inputs that do not have trailing newlines, set the lineterm
1223 argument to "" so that the output will be uniformly newline free.
1224
1225 The context diff format normally has a header for filenames and
1226 modification times. Any or all of these may be specified using
1227 strings for 'fromfile', 'tofile', 'fromfiledate', and 'tofiledate'.
R. David Murrayb2416e52010-04-12 16:58:02 +00001228 The modification times are normally expressed in the ISO 8601 format.
1229 If not specified, the strings default to blanks.
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00001230
1231 Example:
1232
Guido van Rossumbe19ed72007-02-09 05:37:30 +00001233 >>> print(''.join(context_diff('one\ntwo\nthree\nfour\n'.splitlines(1),
R. David Murrayb2416e52010-04-12 16:58:02 +00001234 ... 'zero\none\ntree\nfour\n'.splitlines(1), 'Original', 'Current')),
Guido van Rossumbe19ed72007-02-09 05:37:30 +00001235 ... end="")
R. David Murrayb2416e52010-04-12 16:58:02 +00001236 *** Original
1237 --- Current
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00001238 ***************
1239 *** 1,4 ****
1240 one
1241 ! two
1242 ! three
1243 four
1244 --- 1,4 ----
1245 + zero
1246 one
1247 ! tree
1248 four
1249 """
1250
1251 started = False
Raymond Hettinger7f2d3022003-06-08 19:38:42 +00001252 prefixmap = {'insert':'+ ', 'delete':'- ', 'replace':'! ', 'equal':' '}
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00001253 for group in SequenceMatcher(None,a,b).get_grouped_opcodes(n):
1254 if not started:
R. David Murrayb2416e52010-04-12 16:58:02 +00001255 fromdate = '\t%s' % fromfiledate if fromfiledate else ''
1256 todate = '\t%s' % tofiledate if tofiledate else ''
1257 yield '*** %s%s%s' % (fromfile, fromdate, lineterm)
1258 yield '--- %s%s%s' % (tofile, todate, lineterm)
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00001259 started = True
Raymond Hettinger7f2d3022003-06-08 19:38:42 +00001260
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00001261 yield '***************%s' % (lineterm,)
1262 if group[-1][2] - group[0][1] >= 2:
1263 yield '*** %d,%d ****%s' % (group[0][1]+1, group[-1][2], lineterm)
1264 else:
1265 yield '*** %d ****%s' % (group[-1][2], lineterm)
Raymond Hettinger7f2d3022003-06-08 19:38:42 +00001266 visiblechanges = [e for e in group if e[0] in ('replace', 'delete')]
1267 if visiblechanges:
1268 for tag, i1, i2, _, _ in group:
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00001269 if tag != 'insert':
1270 for line in a[i1:i2]:
1271 yield prefixmap[tag] + line
Raymond Hettinger7f2d3022003-06-08 19:38:42 +00001272
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00001273 if group[-1][4] - group[0][3] >= 2:
1274 yield '--- %d,%d ----%s' % (group[0][3]+1, group[-1][4], lineterm)
1275 else:
1276 yield '--- %d ----%s' % (group[-1][4], lineterm)
Raymond Hettinger7f2d3022003-06-08 19:38:42 +00001277 visiblechanges = [e for e in group if e[0] in ('replace', 'insert')]
1278 if visiblechanges:
1279 for tag, _, _, j1, j2 in group:
Raymond Hettingerf0b1a1f2003-06-08 11:07:08 +00001280 if tag != 'delete':
1281 for line in b[j1:j2]:
1282 yield prefixmap[tag] + line
1283
Tim Peters81b92512002-04-29 01:37:32 +00001284def ndiff(a, b, linejunk=None, charjunk=IS_CHARACTER_JUNK):
Tim Peters5e824c32001-08-12 22:25:01 +00001285 r"""
1286 Compare `a` and `b` (lists of strings); return a `Differ`-style delta.
1287
1288 Optional keyword parameters `linejunk` and `charjunk` are for filter
1289 functions (or None):
1290
1291 - linejunk: A function that should accept a single string argument, and
Tim Peters81b92512002-04-29 01:37:32 +00001292 return true iff the string is junk. The default is None, and is
1293 recommended; as of Python 2.3, an adaptive notion of "noise" lines is
1294 used that does a good job on its own.
Tim Peters5e824c32001-08-12 22:25:01 +00001295
1296 - charjunk: A function that should accept a string of length 1. The
1297 default is module-level function IS_CHARACTER_JUNK, which filters out
1298 whitespace characters (a blank or tab; note: bad idea to include newline
1299 in this!).
1300
1301 Tools/scripts/ndiff.py is a command-line front-end to this function.
1302
1303 Example:
1304
1305 >>> diff = ndiff('one\ntwo\nthree\n'.splitlines(1),
1306 ... 'ore\ntree\nemu\n'.splitlines(1))
Guido van Rossumbe19ed72007-02-09 05:37:30 +00001307 >>> print(''.join(diff), end="")
Tim Peters5e824c32001-08-12 22:25:01 +00001308 - one
1309 ? ^
1310 + ore
1311 ? ^
1312 - two
1313 - three
1314 ? -
1315 + tree
1316 + emu
1317 """
1318 return Differ(linejunk, charjunk).compare(a, b)
1319
Martin v. Löwise064b412004-08-29 16:34:40 +00001320def _mdiff(fromlines, tolines, context=None, linejunk=None,
1321 charjunk=IS_CHARACTER_JUNK):
Thomas Wouters902d6eb2007-01-09 23:18:33 +00001322 r"""Returns generator yielding marked up from/to side by side differences.
Martin v. Löwise064b412004-08-29 16:34:40 +00001323
1324 Arguments:
1325 fromlines -- list of text lines to compared to tolines
1326 tolines -- list of text lines to be compared to fromlines
1327 context -- number of context lines to display on each side of difference,
1328 if None, all from/to text lines will be generated.
1329 linejunk -- passed on to ndiff (see ndiff documentation)
1330 charjunk -- passed on to ndiff (see ndiff documentation)
Tim Peters48bd7f32004-08-29 22:38:38 +00001331
Martin v. Löwise064b412004-08-29 16:34:40 +00001332 This function returns an interator which returns a tuple:
1333 (from line tuple, to line tuple, boolean flag)
1334
1335 from/to line tuple -- (line num, line text)
Mark Dickinson934896d2009-02-21 20:59:32 +00001336 line num -- integer or None (to indicate a context separation)
Martin v. Löwise064b412004-08-29 16:34:40 +00001337 line text -- original line text with following markers inserted:
1338 '\0+' -- marks start of added text
1339 '\0-' -- marks start of deleted text
1340 '\0^' -- marks start of changed text
1341 '\1' -- marks end of added/deleted/changed text
Tim Peters48bd7f32004-08-29 22:38:38 +00001342
Martin v. Löwise064b412004-08-29 16:34:40 +00001343 boolean flag -- None indicates context separation, True indicates
1344 either "from" or "to" line contains a change, otherwise False.
1345
1346 This function/iterator was originally developed to generate side by side
1347 file difference for making HTML pages (see HtmlDiff class for example
1348 usage).
1349
1350 Note, this function utilizes the ndiff function to generate the side by
1351 side difference markup. Optional ndiff arguments may be passed to this
Tim Peters48bd7f32004-08-29 22:38:38 +00001352 function and they in turn will be passed to ndiff.
Martin v. Löwise064b412004-08-29 16:34:40 +00001353 """
Tim Peters48bd7f32004-08-29 22:38:38 +00001354 import re
Martin v. Löwise064b412004-08-29 16:34:40 +00001355
1356 # regular expression for finding intraline change indices
1357 change_re = re.compile('(\++|\-+|\^+)')
Tim Peters48bd7f32004-08-29 22:38:38 +00001358
Martin v. Löwise064b412004-08-29 16:34:40 +00001359 # create the difference iterator to generate the differences
1360 diff_lines_iterator = ndiff(fromlines,tolines,linejunk,charjunk)
1361
1362 def _make_line(lines, format_key, side, num_lines=[0,0]):
1363 """Returns line of text with user's change markup and line formatting.
1364
1365 lines -- list of lines from the ndiff generator to produce a line of
1366 text from. When producing the line of text to return, the
1367 lines used are removed from this list.
1368 format_key -- '+' return first line in list with "add" markup around
1369 the entire line.
1370 '-' return first line in list with "delete" markup around
1371 the entire line.
1372 '?' return first line in list with add/delete/change
1373 intraline markup (indices obtained from second line)
1374 None return first line in list with no markup
1375 side -- indice into the num_lines list (0=from,1=to)
1376 num_lines -- from/to current line number. This is NOT intended to be a
1377 passed parameter. It is present as a keyword argument to
1378 maintain memory of the current line numbers between calls
1379 of this function.
1380
1381 Note, this function is purposefully not defined at the module scope so
1382 that data it needs from its parent function (within whose context it
1383 is defined) does not need to be of module scope.
1384 """
1385 num_lines[side] += 1
1386 # Handle case where no user markup is to be added, just return line of
1387 # text with user's line format to allow for usage of the line number.
1388 if format_key is None:
1389 return (num_lines[side],lines.pop(0)[2:])
1390 # Handle case of intraline changes
1391 if format_key == '?':
1392 text, markers = lines.pop(0), lines.pop(0)
1393 # find intraline changes (store change type and indices in tuples)
1394 sub_info = []
1395 def record_sub_info(match_object,sub_info=sub_info):
1396 sub_info.append([match_object.group(1)[0],match_object.span()])
1397 return match_object.group(1)
1398 change_re.sub(record_sub_info,markers)
1399 # process each tuple inserting our special marks that won't be
1400 # noticed by an xml/html escaper.
1401 for key,(begin,end) in sub_info[::-1]:
1402 text = text[0:begin]+'\0'+key+text[begin:end]+'\1'+text[end:]
1403 text = text[2:]
1404 # Handle case of add/delete entire line
1405 else:
1406 text = lines.pop(0)[2:]
1407 # if line of text is just a newline, insert a space so there is
1408 # something for the user to highlight and see.
Tim Peters0ca0c642004-11-12 16:12:15 +00001409 if not text:
1410 text = ' '
Martin v. Löwise064b412004-08-29 16:34:40 +00001411 # insert marks that won't be noticed by an xml/html escaper.
1412 text = '\0' + format_key + text + '\1'
Georg Brandl7eb4b7d2005-07-22 21:49:32 +00001413 # Return line of text, first allow user's line formatter to do its
Martin v. Löwise064b412004-08-29 16:34:40 +00001414 # thing (such as adding the line number) then replace the special
1415 # marks with what the user's change markup.
1416 return (num_lines[side],text)
Tim Peters48bd7f32004-08-29 22:38:38 +00001417
Martin v. Löwise064b412004-08-29 16:34:40 +00001418 def _line_iterator():
1419 """Yields from/to lines of text with a change indication.
1420
1421 This function is an iterator. It itself pulls lines from a
1422 differencing iterator, processes them and yields them. When it can
1423 it yields both a "from" and a "to" line, otherwise it will yield one
1424 or the other. In addition to yielding the lines of from/to text, a
1425 boolean flag is yielded to indicate if the text line(s) have
1426 differences in them.
1427
1428 Note, this function is purposefully not defined at the module scope so
1429 that data it needs from its parent function (within whose context it
1430 is defined) does not need to be of module scope.
1431 """
1432 lines = []
1433 num_blanks_pending, num_blanks_to_yield = 0, 0
Tim Peters48bd7f32004-08-29 22:38:38 +00001434 while True:
Martin v. Löwise064b412004-08-29 16:34:40 +00001435 # Load up next 4 lines so we can look ahead, create strings which
1436 # are a concatenation of the first character of each of the 4 lines
1437 # so we can do some very readable comparisons.
1438 while len(lines) < 4:
1439 try:
Georg Brandla18af4e2007-04-21 15:47:16 +00001440 lines.append(next(diff_lines_iterator))
Martin v. Löwise064b412004-08-29 16:34:40 +00001441 except StopIteration:
1442 lines.append('X')
1443 s = ''.join([line[0] for line in lines])
1444 if s.startswith('X'):
1445 # When no more lines, pump out any remaining blank lines so the
1446 # corresponding add/delete lines get a matching blank line so
1447 # all line pairs get yielded at the next level.
1448 num_blanks_to_yield = num_blanks_pending
1449 elif s.startswith('-?+?'):
1450 # simple intraline change
1451 yield _make_line(lines,'?',0), _make_line(lines,'?',1), True
1452 continue
1453 elif s.startswith('--++'):
1454 # in delete block, add block coming: we do NOT want to get
1455 # caught up on blank lines yet, just process the delete line
1456 num_blanks_pending -= 1
1457 yield _make_line(lines,'-',0), None, True
1458 continue
Thomas Wouters0e3f5912006-08-11 14:57:12 +00001459 elif s.startswith(('--?+', '--+', '- ')):
Martin v. Löwise064b412004-08-29 16:34:40 +00001460 # in delete block and see a intraline change or unchanged line
1461 # coming: yield the delete line and then blanks
1462 from_line,to_line = _make_line(lines,'-',0), None
1463 num_blanks_to_yield,num_blanks_pending = num_blanks_pending-1,0
1464 elif s.startswith('-+?'):
1465 # intraline change
1466 yield _make_line(lines,None,0), _make_line(lines,'?',1), True
1467 continue
1468 elif s.startswith('-?+'):
1469 # intraline change
1470 yield _make_line(lines,'?',0), _make_line(lines,None,1), True
1471 continue
1472 elif s.startswith('-'):
1473 # delete FROM line
1474 num_blanks_pending -= 1
1475 yield _make_line(lines,'-',0), None, True
1476 continue
1477 elif s.startswith('+--'):
1478 # in add block, delete block coming: we do NOT want to get
1479 # caught up on blank lines yet, just process the add line
1480 num_blanks_pending += 1
1481 yield None, _make_line(lines,'+',1), True
1482 continue
Thomas Wouters0e3f5912006-08-11 14:57:12 +00001483 elif s.startswith(('+ ', '+-')):
Martin v. Löwise064b412004-08-29 16:34:40 +00001484 # will be leaving an add block: yield blanks then add line
1485 from_line, to_line = None, _make_line(lines,'+',1)
1486 num_blanks_to_yield,num_blanks_pending = num_blanks_pending+1,0
1487 elif s.startswith('+'):
1488 # inside an add block, yield the add line
1489 num_blanks_pending += 1
1490 yield None, _make_line(lines,'+',1), True
1491 continue
1492 elif s.startswith(' '):
1493 # unchanged text, yield it to both sides
1494 yield _make_line(lines[:],None,0),_make_line(lines,None,1),False
1495 continue
1496 # Catch up on the blank lines so when we yield the next from/to
1497 # pair, they are lined up.
1498 while(num_blanks_to_yield < 0):
1499 num_blanks_to_yield += 1
1500 yield None,('','\n'),True
1501 while(num_blanks_to_yield > 0):
1502 num_blanks_to_yield -= 1
1503 yield ('','\n'),None,True
1504 if s.startswith('X'):
1505 raise StopIteration
1506 else:
1507 yield from_line,to_line,True
1508
1509 def _line_pair_iterator():
1510 """Yields from/to lines of text with a change indication.
1511
1512 This function is an iterator. It itself pulls lines from the line
Georg Brandl7eb4b7d2005-07-22 21:49:32 +00001513 iterator. Its difference from that iterator is that this function
Martin v. Löwise064b412004-08-29 16:34:40 +00001514 always yields a pair of from/to text lines (with the change
1515 indication). If necessary it will collect single from/to lines
1516 until it has a matching pair from/to pair to yield.
1517
1518 Note, this function is purposefully not defined at the module scope so
1519 that data it needs from its parent function (within whose context it
1520 is defined) does not need to be of module scope.
1521 """
1522 line_iterator = _line_iterator()
1523 fromlines,tolines=[],[]
1524 while True:
1525 # Collecting lines of text until we have a from/to pair
1526 while (len(fromlines)==0 or len(tolines)==0):
Georg Brandla18af4e2007-04-21 15:47:16 +00001527 from_line, to_line, found_diff = next(line_iterator)
Martin v. Löwise064b412004-08-29 16:34:40 +00001528 if from_line is not None:
1529 fromlines.append((from_line,found_diff))
1530 if to_line is not None:
1531 tolines.append((to_line,found_diff))
1532 # Once we have a pair, remove them from the collection and yield it
1533 from_line, fromDiff = fromlines.pop(0)
1534 to_line, to_diff = tolines.pop(0)
1535 yield (from_line,to_line,fromDiff or to_diff)
1536
1537 # Handle case where user does not want context differencing, just yield
1538 # them up without doing anything else with them.
1539 line_pair_iterator = _line_pair_iterator()
1540 if context is None:
1541 while True:
Georg Brandla18af4e2007-04-21 15:47:16 +00001542 yield next(line_pair_iterator)
Martin v. Löwise064b412004-08-29 16:34:40 +00001543 # Handle case where user wants context differencing. We must do some
1544 # storage of lines until we know for sure that they are to be yielded.
1545 else:
1546 context += 1
1547 lines_to_write = 0
1548 while True:
1549 # Store lines up until we find a difference, note use of a
1550 # circular queue because we only need to keep around what
1551 # we need for context.
1552 index, contextLines = 0, [None]*(context)
1553 found_diff = False
1554 while(found_diff is False):
Georg Brandla18af4e2007-04-21 15:47:16 +00001555 from_line, to_line, found_diff = next(line_pair_iterator)
Martin v. Löwise064b412004-08-29 16:34:40 +00001556 i = index % context
1557 contextLines[i] = (from_line, to_line, found_diff)
1558 index += 1
1559 # Yield lines that we have collected so far, but first yield
1560 # the user's separator.
1561 if index > context:
1562 yield None, None, None
1563 lines_to_write = context
1564 else:
1565 lines_to_write = index
1566 index = 0
1567 while(lines_to_write):
1568 i = index % context
1569 index += 1
1570 yield contextLines[i]
1571 lines_to_write -= 1
1572 # Now yield the context lines after the change
1573 lines_to_write = context-1
1574 while(lines_to_write):
Georg Brandla18af4e2007-04-21 15:47:16 +00001575 from_line, to_line, found_diff = next(line_pair_iterator)
Martin v. Löwise064b412004-08-29 16:34:40 +00001576 # If another change within the context, extend the context
1577 if found_diff:
1578 lines_to_write = context-1
1579 else:
1580 lines_to_write -= 1
1581 yield from_line, to_line, found_diff
1582
1583
1584_file_template = """
1585<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
1586 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
1587
1588<html>
1589
1590<head>
Tim Peters48bd7f32004-08-29 22:38:38 +00001591 <meta http-equiv="Content-Type"
Martin v. Löwise064b412004-08-29 16:34:40 +00001592 content="text/html; charset=ISO-8859-1" />
1593 <title></title>
1594 <style type="text/css">%(styles)s
1595 </style>
1596</head>
1597
1598<body>
1599 %(table)s%(legend)s
1600</body>
1601
1602</html>"""
1603
1604_styles = """
1605 table.diff {font-family:Courier; border:medium;}
1606 .diff_header {background-color:#e0e0e0}
1607 td.diff_header {text-align:right}
1608 .diff_next {background-color:#c0c0c0}
1609 .diff_add {background-color:#aaffaa}
1610 .diff_chg {background-color:#ffff77}
1611 .diff_sub {background-color:#ffaaaa}"""
1612
1613_table_template = """
Tim Peters48bd7f32004-08-29 22:38:38 +00001614 <table class="diff" id="difflib_chg_%(prefix)s_top"
1615 cellspacing="0" cellpadding="0" rules="groups" >
1616 <colgroup></colgroup> <colgroup></colgroup> <colgroup></colgroup>
Martin v. Löwise064b412004-08-29 16:34:40 +00001617 <colgroup></colgroup> <colgroup></colgroup> <colgroup></colgroup>
1618 %(header_row)s
1619 <tbody>
1620%(data_rows)s </tbody>
1621 </table>"""
1622
1623_legend = """
1624 <table class="diff" summary="Legends">
1625 <tr> <th colspan="2"> Legends </th> </tr>
1626 <tr> <td> <table border="" summary="Colors">
1627 <tr><th> Colors </th> </tr>
1628 <tr><td class="diff_add">&nbsp;Added&nbsp;</td></tr>
1629 <tr><td class="diff_chg">Changed</td> </tr>
1630 <tr><td class="diff_sub">Deleted</td> </tr>
1631 </table></td>
1632 <td> <table border="" summary="Links">
1633 <tr><th colspan="2"> Links </th> </tr>
1634 <tr><td>(f)irst change</td> </tr>
1635 <tr><td>(n)ext change</td> </tr>
1636 <tr><td>(t)op</td> </tr>
1637 </table></td> </tr>
1638 </table>"""
1639
1640class HtmlDiff(object):
1641 """For producing HTML side by side comparison with change highlights.
1642
1643 This class can be used to create an HTML table (or a complete HTML file
Andrew M. Kuchling55be9ea2004-09-10 12:59:54 +00001644 containing the table) showing a side by side, line by line comparison
Tim Peters48bd7f32004-08-29 22:38:38 +00001645 of text with inter-line and intra-line change highlights. The table can
Martin v. Löwise064b412004-08-29 16:34:40 +00001646 be generated in either full or contextual difference mode.
Tim Peters48bd7f32004-08-29 22:38:38 +00001647
Martin v. Löwise064b412004-08-29 16:34:40 +00001648 The following methods are provided for HTML generation:
1649
1650 make_table -- generates HTML for a single side by side table
1651 make_file -- generates complete HTML file with a single side by side table
1652
Tim Peters48bd7f32004-08-29 22:38:38 +00001653 See tools/scripts/diff.py for an example usage of this class.
Martin v. Löwise064b412004-08-29 16:34:40 +00001654 """
1655
1656 _file_template = _file_template
1657 _styles = _styles
1658 _table_template = _table_template
1659 _legend = _legend
1660 _default_prefix = 0
Tim Peters48bd7f32004-08-29 22:38:38 +00001661
Martin v. Löwise064b412004-08-29 16:34:40 +00001662 def __init__(self,tabsize=8,wrapcolumn=None,linejunk=None,
1663 charjunk=IS_CHARACTER_JUNK):
1664 """HtmlDiff instance initializer
1665
1666 Arguments:
1667 tabsize -- tab stop spacing, defaults to 8.
1668 wrapcolumn -- column number where lines are broken and wrapped,
1669 defaults to None where lines are not wrapped.
1670 linejunk,charjunk -- keyword arguments passed into ndiff() (used to by
Tim Peters48bd7f32004-08-29 22:38:38 +00001671 HtmlDiff() to generate the side by side HTML differences). See
Martin v. Löwise064b412004-08-29 16:34:40 +00001672 ndiff() documentation for argument default values and descriptions.
1673 """
1674 self._tabsize = tabsize
1675 self._wrapcolumn = wrapcolumn
1676 self._linejunk = linejunk
1677 self._charjunk = charjunk
1678
1679 def make_file(self,fromlines,tolines,fromdesc='',todesc='',context=False,
1680 numlines=5):
1681 """Returns HTML file of side by side comparison with change highlights
1682
1683 Arguments:
1684 fromlines -- list of "from" lines
1685 tolines -- list of "to" lines
1686 fromdesc -- "from" file column header string
1687 todesc -- "to" file column header string
1688 context -- set to True for contextual differences (defaults to False
1689 which shows full differences).
1690 numlines -- number of context lines. When context is set True,
1691 controls number of lines displayed before and after the change.
1692 When context is False, controls the number of lines to place
1693 the "next" link anchors before the next change (so click of
1694 "next" link jumps to just before the change).
1695 """
Tim Peters48bd7f32004-08-29 22:38:38 +00001696
Martin v. Löwise064b412004-08-29 16:34:40 +00001697 return self._file_template % dict(
1698 styles = self._styles,
1699 legend = self._legend,
1700 table = self.make_table(fromlines,tolines,fromdesc,todesc,
1701 context=context,numlines=numlines))
Tim Peters48bd7f32004-08-29 22:38:38 +00001702
Martin v. Löwise064b412004-08-29 16:34:40 +00001703 def _tab_newline_replace(self,fromlines,tolines):
1704 """Returns from/to line lists with tabs expanded and newlines removed.
1705
1706 Instead of tab characters being replaced by the number of spaces
1707 needed to fill in to the next tab stop, this function will fill
1708 the space with tab characters. This is done so that the difference
1709 algorithms can identify changes in a file when tabs are replaced by
1710 spaces and vice versa. At the end of the HTML generation, the tab
1711 characters will be replaced with a nonbreakable space.
1712 """
1713 def expand_tabs(line):
1714 # hide real spaces
1715 line = line.replace(' ','\0')
1716 # expand tabs into spaces
1717 line = line.expandtabs(self._tabsize)
1718 # relace spaces from expanded tabs back into tab characters
1719 # (we'll replace them with markup after we do differencing)
1720 line = line.replace(' ','\t')
1721 return line.replace('\0',' ').rstrip('\n')
1722 fromlines = [expand_tabs(line) for line in fromlines]
1723 tolines = [expand_tabs(line) for line in tolines]
1724 return fromlines,tolines
1725
1726 def _split_line(self,data_list,line_num,text):
1727 """Builds list of text lines by splitting text lines at wrap point
1728
1729 This function will determine if the input text line needs to be
1730 wrapped (split) into separate lines. If so, the first wrap point
1731 will be determined and the first line appended to the output
1732 text line list. This function is used recursively to handle
1733 the second part of the split line to further split it.
1734 """
1735 # if blank line or context separator, just add it to the output list
1736 if not line_num:
1737 data_list.append((line_num,text))
1738 return
1739
1740 # if line text doesn't need wrapping, just add it to the output list
1741 size = len(text)
1742 max = self._wrapcolumn
1743 if (size <= max) or ((size -(text.count('\0')*3)) <= max):
1744 data_list.append((line_num,text))
1745 return
1746
1747 # scan text looking for the wrap point, keeping track if the wrap
1748 # point is inside markers
1749 i = 0
1750 n = 0
1751 mark = ''
1752 while n < max and i < size:
1753 if text[i] == '\0':
1754 i += 1
1755 mark = text[i]
1756 i += 1
1757 elif text[i] == '\1':
1758 i += 1
1759 mark = ''
1760 else:
1761 i += 1
1762 n += 1
1763
1764 # wrap point is inside text, break it up into separate lines
1765 line1 = text[:i]
1766 line2 = text[i:]
1767
1768 # if wrap point is inside markers, place end marker at end of first
1769 # line and start marker at beginning of second line because each
1770 # line will have its own table tag markup around it.
1771 if mark:
1772 line1 = line1 + '\1'
1773 line2 = '\0' + mark + line2
1774
Tim Peters48bd7f32004-08-29 22:38:38 +00001775 # tack on first line onto the output list
Martin v. Löwise064b412004-08-29 16:34:40 +00001776 data_list.append((line_num,line1))
1777
Tim Peters48bd7f32004-08-29 22:38:38 +00001778 # use this routine again to wrap the remaining text
Martin v. Löwise064b412004-08-29 16:34:40 +00001779 self._split_line(data_list,'>',line2)
1780
1781 def _line_wrapper(self,diffs):
1782 """Returns iterator that splits (wraps) mdiff text lines"""
1783
1784 # pull from/to data and flags from mdiff iterator
1785 for fromdata,todata,flag in diffs:
1786 # check for context separators and pass them through
1787 if flag is None:
1788 yield fromdata,todata,flag
1789 continue
1790 (fromline,fromtext),(toline,totext) = fromdata,todata
1791 # for each from/to line split it at the wrap column to form
1792 # list of text lines.
1793 fromlist,tolist = [],[]
1794 self._split_line(fromlist,fromline,fromtext)
1795 self._split_line(tolist,toline,totext)
1796 # yield from/to line in pairs inserting blank lines as
1797 # necessary when one side has more wrapped lines
1798 while fromlist or tolist:
1799 if fromlist:
1800 fromdata = fromlist.pop(0)
1801 else:
1802 fromdata = ('',' ')
1803 if tolist:
1804 todata = tolist.pop(0)
1805 else:
1806 todata = ('',' ')
1807 yield fromdata,todata,flag
1808
1809 def _collect_lines(self,diffs):
1810 """Collects mdiff output into separate lists
1811
1812 Before storing the mdiff from/to data into a list, it is converted
1813 into a single line of text with HTML markup.
1814 """
1815
1816 fromlist,tolist,flaglist = [],[],[]
Tim Peters48bd7f32004-08-29 22:38:38 +00001817 # pull from/to data and flags from mdiff style iterator
Martin v. Löwise064b412004-08-29 16:34:40 +00001818 for fromdata,todata,flag in diffs:
1819 try:
1820 # store HTML markup of the lines into the lists
1821 fromlist.append(self._format_line(0,flag,*fromdata))
1822 tolist.append(self._format_line(1,flag,*todata))
1823 except TypeError:
1824 # exceptions occur for lines where context separators go
1825 fromlist.append(None)
1826 tolist.append(None)
1827 flaglist.append(flag)
1828 return fromlist,tolist,flaglist
Tim Peters48bd7f32004-08-29 22:38:38 +00001829
Martin v. Löwise064b412004-08-29 16:34:40 +00001830 def _format_line(self,side,flag,linenum,text):
1831 """Returns HTML markup of "from" / "to" text lines
1832
1833 side -- 0 or 1 indicating "from" or "to" text
1834 flag -- indicates if difference on line
1835 linenum -- line number (used for line number column)
1836 text -- line text to be marked up
1837 """
1838 try:
1839 linenum = '%d' % linenum
1840 id = ' id="%s%s"' % (self._prefix[side],linenum)
1841 except TypeError:
1842 # handle blank lines where linenum is '>' or ''
Tim Peters48bd7f32004-08-29 22:38:38 +00001843 id = ''
Martin v. Löwise064b412004-08-29 16:34:40 +00001844 # replace those things that would get confused with HTML symbols
1845 text=text.replace("&","&amp;").replace(">","&gt;").replace("<","&lt;")
1846
1847 # make space non-breakable so they don't get compressed or line wrapped
1848 text = text.replace(' ','&nbsp;').rstrip()
1849
1850 return '<td class="diff_header"%s>%s</td><td nowrap="nowrap">%s</td>' \
1851 % (id,linenum,text)
1852
1853 def _make_prefix(self):
1854 """Create unique anchor prefixes"""
1855
1856 # Generate a unique anchor prefix so multiple tables
1857 # can exist on the same HTML page without conflicts.
1858 fromprefix = "from%d_" % HtmlDiff._default_prefix
1859 toprefix = "to%d_" % HtmlDiff._default_prefix
1860 HtmlDiff._default_prefix += 1
1861 # store prefixes so line format method has access
1862 self._prefix = [fromprefix,toprefix]
1863
1864 def _convert_flags(self,fromlist,tolist,flaglist,context,numlines):
1865 """Makes list of "next" links"""
Tim Peters48bd7f32004-08-29 22:38:38 +00001866
Martin v. Löwise064b412004-08-29 16:34:40 +00001867 # all anchor names will be generated using the unique "to" prefix
1868 toprefix = self._prefix[1]
Tim Peters48bd7f32004-08-29 22:38:38 +00001869
Martin v. Löwise064b412004-08-29 16:34:40 +00001870 # process change flags, generating middle column of next anchors/links
1871 next_id = ['']*len(flaglist)
1872 next_href = ['']*len(flaglist)
1873 num_chg, in_change = 0, False
1874 last = 0
1875 for i,flag in enumerate(flaglist):
1876 if flag:
1877 if not in_change:
1878 in_change = True
1879 last = i
1880 # at the beginning of a change, drop an anchor a few lines
Tim Peters48bd7f32004-08-29 22:38:38 +00001881 # (the context lines) before the change for the previous
Martin v. Löwise064b412004-08-29 16:34:40 +00001882 # link
1883 i = max([0,i-numlines])
1884 next_id[i] = ' id="difflib_chg_%s_%d"' % (toprefix,num_chg)
Tim Peters48bd7f32004-08-29 22:38:38 +00001885 # at the beginning of a change, drop a link to the next
Martin v. Löwise064b412004-08-29 16:34:40 +00001886 # change
1887 num_chg += 1
1888 next_href[last] = '<a href="#difflib_chg_%s_%d">n</a>' % (
1889 toprefix,num_chg)
1890 else:
1891 in_change = False
1892 # check for cases where there is no content to avoid exceptions
1893 if not flaglist:
1894 flaglist = [False]
1895 next_id = ['']
1896 next_href = ['']
1897 last = 0
1898 if context:
1899 fromlist = ['<td></td><td>&nbsp;No Differences Found&nbsp;</td>']
1900 tolist = fromlist
1901 else:
1902 fromlist = tolist = ['<td></td><td>&nbsp;Empty File&nbsp;</td>']
1903 # if not a change on first line, drop a link
1904 if not flaglist[0]:
1905 next_href[0] = '<a href="#difflib_chg_%s_0">f</a>' % toprefix
1906 # redo the last link to link to the top
1907 next_href[last] = '<a href="#difflib_chg_%s_top">t</a>' % (toprefix)
1908
1909 return fromlist,tolist,flaglist,next_href,next_id
1910
1911 def make_table(self,fromlines,tolines,fromdesc='',todesc='',context=False,
1912 numlines=5):
1913 """Returns HTML table of side by side comparison with change highlights
1914
1915 Arguments:
1916 fromlines -- list of "from" lines
1917 tolines -- list of "to" lines
1918 fromdesc -- "from" file column header string
1919 todesc -- "to" file column header string
1920 context -- set to True for contextual differences (defaults to False
1921 which shows full differences).
1922 numlines -- number of context lines. When context is set True,
1923 controls number of lines displayed before and after the change.
1924 When context is False, controls the number of lines to place
1925 the "next" link anchors before the next change (so click of
1926 "next" link jumps to just before the change).
1927 """
1928
1929 # make unique anchor prefixes so that multiple tables may exist
1930 # on the same page without conflict.
1931 self._make_prefix()
Tim Peters48bd7f32004-08-29 22:38:38 +00001932
Martin v. Löwise064b412004-08-29 16:34:40 +00001933 # change tabs to spaces before it gets more difficult after we insert
1934 # markkup
1935 fromlines,tolines = self._tab_newline_replace(fromlines,tolines)
Tim Peters48bd7f32004-08-29 22:38:38 +00001936
Martin v. Löwise064b412004-08-29 16:34:40 +00001937 # create diffs iterator which generates side by side from/to data
1938 if context:
1939 context_lines = numlines
1940 else:
1941 context_lines = None
1942 diffs = _mdiff(fromlines,tolines,context_lines,linejunk=self._linejunk,
1943 charjunk=self._charjunk)
1944
1945 # set up iterator to wrap lines that exceed desired width
1946 if self._wrapcolumn:
1947 diffs = self._line_wrapper(diffs)
Tim Peters48bd7f32004-08-29 22:38:38 +00001948
Martin v. Löwise064b412004-08-29 16:34:40 +00001949 # collect up from/to lines and flags into lists (also format the lines)
1950 fromlist,tolist,flaglist = self._collect_lines(diffs)
1951
1952 # process change flags, generating middle column of next anchors/links
1953 fromlist,tolist,flaglist,next_href,next_id = self._convert_flags(
1954 fromlist,tolist,flaglist,context,numlines)
1955
Guido van Rossumd8faa362007-04-27 19:54:29 +00001956 s = []
Martin v. Löwise064b412004-08-29 16:34:40 +00001957 fmt = ' <tr><td class="diff_next"%s>%s</td>%s' + \
1958 '<td class="diff_next">%s</td>%s</tr>\n'
1959 for i in range(len(flaglist)):
1960 if flaglist[i] is None:
1961 # mdiff yields None on separator lines skip the bogus ones
1962 # generated for the first line
1963 if i > 0:
Guido van Rossumd8faa362007-04-27 19:54:29 +00001964 s.append(' </tbody> \n <tbody>\n')
Martin v. Löwise064b412004-08-29 16:34:40 +00001965 else:
Guido van Rossumd8faa362007-04-27 19:54:29 +00001966 s.append( fmt % (next_id[i],next_href[i],fromlist[i],
Martin v. Löwise064b412004-08-29 16:34:40 +00001967 next_href[i],tolist[i]))
1968 if fromdesc or todesc:
1969 header_row = '<thead><tr>%s%s%s%s</tr></thead>' % (
1970 '<th class="diff_next"><br /></th>',
1971 '<th colspan="2" class="diff_header">%s</th>' % fromdesc,
1972 '<th class="diff_next"><br /></th>',
1973 '<th colspan="2" class="diff_header">%s</th>' % todesc)
1974 else:
1975 header_row = ''
1976
1977 table = self._table_template % dict(
Guido van Rossumd8faa362007-04-27 19:54:29 +00001978 data_rows=''.join(s),
Martin v. Löwise064b412004-08-29 16:34:40 +00001979 header_row=header_row,
1980 prefix=self._prefix[1])
1981
1982 return table.replace('\0+','<span class="diff_add">'). \
1983 replace('\0-','<span class="diff_sub">'). \
1984 replace('\0^','<span class="diff_chg">'). \
1985 replace('\1','</span>'). \
1986 replace('\t','&nbsp;')
Tim Peters48bd7f32004-08-29 22:38:38 +00001987
Martin v. Löwise064b412004-08-29 16:34:40 +00001988del re
1989
Tim Peters5e824c32001-08-12 22:25:01 +00001990def restore(delta, which):
1991 r"""
Tim Peters8a9c2842001-09-22 21:30:22 +00001992 Generate one of the two sequences that generated a delta.
Tim Peters5e824c32001-08-12 22:25:01 +00001993
1994 Given a `delta` produced by `Differ.compare()` or `ndiff()`, extract
1995 lines originating from file 1 or 2 (parameter `which`), stripping off line
1996 prefixes.
1997
1998 Examples:
1999
2000 >>> diff = ndiff('one\ntwo\nthree\n'.splitlines(1),
2001 ... 'ore\ntree\nemu\n'.splitlines(1))
Tim Peters8a9c2842001-09-22 21:30:22 +00002002 >>> diff = list(diff)
Guido van Rossumbe19ed72007-02-09 05:37:30 +00002003 >>> print(''.join(restore(diff, 1)), end="")
Tim Peters5e824c32001-08-12 22:25:01 +00002004 one
2005 two
2006 three
Guido van Rossumbe19ed72007-02-09 05:37:30 +00002007 >>> print(''.join(restore(diff, 2)), end="")
Tim Peters5e824c32001-08-12 22:25:01 +00002008 ore
2009 tree
2010 emu
2011 """
2012 try:
2013 tag = {1: "- ", 2: "+ "}[int(which)]
2014 except KeyError:
Collin Winterce36ad82007-08-30 01:19:48 +00002015 raise ValueError('unknown delta choice (must be 1 or 2): %r'
Tim Peters5e824c32001-08-12 22:25:01 +00002016 % which)
2017 prefixes = (" ", tag)
Tim Peters5e824c32001-08-12 22:25:01 +00002018 for line in delta:
2019 if line[:2] in prefixes:
Tim Peters8a9c2842001-09-22 21:30:22 +00002020 yield line[2:]
Tim Peters5e824c32001-08-12 22:25:01 +00002021
Tim Peters9ae21482001-02-10 08:00:53 +00002022def _test():
2023 import doctest, difflib
2024 return doctest.testmod(difflib)
2025
2026if __name__ == "__main__":
2027 _test()