Rename ndiff.py and difflib.py modules, which are only provided for
python 1.5 compatibility. * lib/difflib.py * lib/ndiff.py * lib/compat_ndiff.py * lib/compat_difflib.py rename * viewcvs-install update ndiff invocation git-svn-id: http://viewvc.tigris.org/svn/viewvc/trunk@1241 8cb11bc2-c004-0410-86c3-e597b4017df7remotes/tags/1.0.0-rc1
parent
0000ed88bb
commit
c4edb250aa
|
@ -99,7 +99,7 @@ __version__ = 1, 6, 1
|
|||
# is sent to stdout. Or you can call main(args), passing what would
|
||||
# have been in sys.argv[1:] had the cmd-line form been used.
|
||||
|
||||
from difflib import SequenceMatcher
|
||||
from compat_difflib import SequenceMatcher
|
||||
|
||||
TRACE = 0
|
||||
|
|
@ -35,7 +35,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]), 'lib'))
|
|||
|
||||
import compat
|
||||
import viewcvs
|
||||
import ndiff
|
||||
import compat_ndiff
|
||||
version = viewcvs.__version__
|
||||
|
||||
|
||||
|
@ -145,7 +145,7 @@ def InstallFile(src_path, dest_path, mode, set_python_paths, prompt_replace,
|
|||
if prompt_replace and os.path.exists(DESTDIR + dest_path):
|
||||
# Collect ndiff output from ndiff
|
||||
sys.stdout = StringIO.StringIO()
|
||||
ndiff.main([DESTDIR + dest_path,src_path])
|
||||
compat_ndiff.main([DESTDIR + dest_path,src_path])
|
||||
ndiff_output = sys.stdout.getvalue()
|
||||
|
||||
# Return everything to normal
|
||||
|
|
Loading…
Reference in New Issue