summaryrefslogtreecommitdiff
path: root/src/zope/tal/runtest.py
diff options
context:
space:
mode:
authorMarius Gedminas <marius@gedmin.as>2013-02-07 23:04:43 +0000
committerMarius Gedminas <marius@gedmin.as>2013-02-07 23:04:43 +0000
commit5a72bca56916f5d8f209ae9ba1e55a3c5cfeaab4 (patch)
treec6cd52570cb2fc678b3a824c32a96619de787d6f /src/zope/tal/runtest.py
parent247755683b79d7975e7987bd021a564bbd593cf1 (diff)
downloadzope-tal-5a72bca56916f5d8f209ae9ba1e55a3c5cfeaab4.tar.gz
Replace ndiff.py with stdlib's difflib
Diffstat (limited to 'src/zope/tal/runtest.py')
-rw-r--r--src/zope/tal/runtest.py18
1 files changed, 2 insertions, 16 deletions
diff --git a/src/zope/tal/runtest.py b/src/zope/tal/runtest.py
index 4bc35c9..3677902 100644
--- a/src/zope/tal/runtest.py
+++ b/src/zope/tal/runtest.py
@@ -21,6 +21,7 @@ import glob
import os
import sys
import traceback
+import difflib
from cStringIO import StringIO
@@ -31,22 +32,7 @@ import zope.tal.driver
import zope.tal.tests.utils
def showdiff(a, b):
- from . import ndiff # XXX consider using difflib
- cruncher = ndiff.SequenceMatcher(ndiff.IS_LINE_JUNK, a, b)
- for tag, alo, ahi, blo, bhi in cruncher.get_opcodes():
- if tag == "equal":
- continue
- print(nicerange(alo, ahi) + tag[0] + nicerange(blo, bhi))
- ndiff.dump('<', a, alo, ahi)
- if a and b:
- print('---')
- ndiff.dump('>', b, blo, bhi)
-
-def nicerange(lo, hi):
- if hi <= lo+1:
- return str(lo+1)
- else:
- return "%d,%d" % (lo+1, hi)
+ print(''.join(difflib.ndiff(a, b)))
def main():
opts = []