equal
deleted
inserted
replaced
1 #!/usr/bin/python |
1 #!/usr/bin/python |
2 import difflib, struct |
2 import difflib, struct |
3 from cStringIO import StringIO |
3 from cStringIO import StringIO |
4 |
4 |
5 def unidiff(a, b, fn): |
5 def unidiff(a, b, fn): |
|
6 if not a and not b: return "" |
6 a = a.splitlines(1) |
7 a = a.splitlines(1) |
7 b = b.splitlines(1) |
8 b = b.splitlines(1) |
8 l = difflib.unified_diff(a, b, fn, fn) |
9 l = list(difflib.unified_diff(a, b, fn, fn)) |
9 return "".join(l) |
10 return "".join(l) |
10 |
11 |
11 def textdiff(a, b): |
12 def textdiff(a, b): |
12 return diff(a.splitlines(1), b.splitlines(1)) |
13 return diff(a.splitlines(1), b.splitlines(1)) |
13 |
14 |