Gecko [ 196.203.21.74 ]

Name	Size	Permission
2to3.py	101 B	-rw-rw-rw-
README.txt	3.72 KB	-rw-rw-rw-
analyze_dxp.py	4.23 KB	-rw-rw-rw-
byext.py	3.98 KB	-rw-rw-rw-
byteyears.py	1.66 KB	-rw-rw-rw-
checkappend.py	4.71 KB	-rw-rw-rw-
checkpip.py	789 B	-rw-rw-rw-
checkpyc.py	2.03 KB	-rw-rw-rw-
classfix.py	6 KB	-rw-rw-rw-
cleanfuture.py	8.65 KB	-rw-rw-rw-
combinerefs.py	4.4 KB	-rw-rw-rw-
copytime.py	690 B	-rw-rw-rw-
crlf.py	634 B	-rw-rw-rw-
cvsfiles.py	1.82 KB	-rw-rw-rw-
db2pickle.py	3.62 KB	-rw-rw-rw-
diff.py	2.07 KB	-rw-rw-rw-
dutree.py	1.64 KB	-rw-rw-rw-
eptags.py	1.5 KB	-rw-rw-rw-
find_recursionlimit.py	3.51 KB	-rw-rw-rw-
finddiv.py	2.55 KB	-rw-rw-rw-
findlinksto.py	1.09 KB	-rw-rw-rw-
findnocoding.py	2.85 KB	-rw-rw-rw-
fixcid.py	10.07 KB	-rw-rw-rw-
fixdiv.py	13.89 KB	-rw-rw-rw-
fixheader.py	1.21 KB	-rw-rw-rw-
fixnotice.py	3.09 KB	-rw-rw-rw-
fixps.py	926 B	-rw-rw-rw-
google.py	543 B	-rw-rw-rw-
gprof2html.py	2.19 KB	-rw-rw-rw-
h2py.py	5.99 KB	-rw-rw-rw-
hotshotmain.py	1.5 KB	-rw-rw-rw-
ifdef.py	3.74 KB	-rw-rw-rw-
lfcr.py	643 B	-rw-rw-rw-
linktree.py	2.45 KB	-rw-rw-rw-
lll.py	775 B	-rw-rw-rw-
logmerge.py	5.63 KB	-rw-rw-rw-
mailerdaemon.py	7.99 KB	-rw-rw-rw-
md5sum.py	2.42 KB	-rw-rw-rw-
methfix.py	5.5 KB	-rw-rw-rw-
mkreal.py	1.65 KB	-rw-rw-rw-
ndiff.py	3.85 KB	-rw-rw-rw-
nm2def.py	2.49 KB	-rw-rw-rw-
objgraph.py	6.09 KB	-rw-rw-rw-
parseentities.py	1.74 KB	-rw-rw-rw-
patchcheck.py	7.73 KB	-rw-rw-rw-
pathfix.py	4.37 KB	-rw-rw-rw-
pdeps.py	4.01 KB	-rw-rw-rw-
pickle2db.py	3.99 KB	-rw-rw-rw-
pindent.py	17.26 KB	-rw-rw-rw-
ptags.py	1.25 KB	-rw-rw-rw-
pydocgui.pyw	222 B	-rw-rw-rw-
pysource.py	3.88 KB	-rw-rw-rw-
redemo.py	5.82 KB	-rw-rw-rw-
reindent-rst.py	292 B	-rw-rw-rw-
reindent.py	11.48 KB	-rw-rw-rw-
rgrep.py	1.52 KB	-rw-rw-rw-
serve.py	1.15 KB	-rw-rw-rw-
setup.py	441 B	-rw-rw-rw-
suff.py	652 B	-rw-rw-rw-
svneol.py	2.95 KB	-rw-rw-rw-
texcheck.py	9.27 KB	-rw-rw-rw-
texi2html.py	70.22 KB	-rw-rw-rw-
treesync.py	5.85 KB	-rw-rw-rw-
untabify.py	1.24 KB	-rw-rw-rw-
which.py	1.65 KB	-rw-rw-rw-
win_add2path.py	1.64 KB	-rw-rw-rw-
xxci.py	2.85 KB	-rw-rw-rw-

Name

Size

Permission

Action

2to3.py

101 B

-rw-rw-rw-

README.txt

3.72 KB

-rw-rw-rw-

analyze_dxp.py

4.23 KB

-rw-rw-rw-

byext.py

3.98 KB

-rw-rw-rw-

byteyears.py

1.66 KB

-rw-rw-rw-

checkappend.py

4.71 KB

-rw-rw-rw-

checkpip.py

789 B

-rw-rw-rw-

checkpyc.py

2.03 KB

-rw-rw-rw-

classfix.py

6 KB

-rw-rw-rw-

cleanfuture.py

8.65 KB

-rw-rw-rw-

combinerefs.py

4.4 KB

-rw-rw-rw-

copytime.py

690 B

-rw-rw-rw-

crlf.py

634 B

-rw-rw-rw-

cvsfiles.py

1.82 KB

-rw-rw-rw-

db2pickle.py

3.62 KB

-rw-rw-rw-

diff.py

2.07 KB

-rw-rw-rw-

dutree.py

1.64 KB

-rw-rw-rw-

eptags.py

1.5 KB

-rw-rw-rw-

find_recursionlimit.py

3.51 KB

-rw-rw-rw-

finddiv.py

2.55 KB

-rw-rw-rw-

findlinksto.py

1.09 KB

-rw-rw-rw-

findnocoding.py

2.85 KB

-rw-rw-rw-

fixcid.py

10.07 KB

-rw-rw-rw-

fixdiv.py

13.89 KB

-rw-rw-rw-

fixheader.py

1.21 KB

-rw-rw-rw-

fixnotice.py

3.09 KB

-rw-rw-rw-

fixps.py

926 B

-rw-rw-rw-

google.py

543 B

-rw-rw-rw-

gprof2html.py

2.19 KB

-rw-rw-rw-

h2py.py

5.99 KB

-rw-rw-rw-

hotshotmain.py

1.5 KB

-rw-rw-rw-

ifdef.py

3.74 KB

-rw-rw-rw-

lfcr.py

643 B

-rw-rw-rw-

linktree.py

2.45 KB

-rw-rw-rw-

lll.py

775 B

-rw-rw-rw-

logmerge.py

5.63 KB

-rw-rw-rw-

mailerdaemon.py

7.99 KB

-rw-rw-rw-

md5sum.py

2.42 KB

-rw-rw-rw-

methfix.py

5.5 KB

-rw-rw-rw-

mkreal.py

1.65 KB

-rw-rw-rw-

ndiff.py

3.85 KB

-rw-rw-rw-

nm2def.py

2.49 KB

-rw-rw-rw-

objgraph.py

6.09 KB

-rw-rw-rw-

parseentities.py

1.74 KB

-rw-rw-rw-

patchcheck.py

7.73 KB

-rw-rw-rw-

pathfix.py

4.37 KB

-rw-rw-rw-

pdeps.py

4.01 KB

-rw-rw-rw-

pickle2db.py

3.99 KB

-rw-rw-rw-

pindent.py

17.26 KB

-rw-rw-rw-

ptags.py

1.25 KB

-rw-rw-rw-

pydocgui.pyw

222 B

-rw-rw-rw-

pysource.py

3.88 KB

-rw-rw-rw-

redemo.py

5.82 KB

-rw-rw-rw-

reindent-rst.py

292 B

-rw-rw-rw-

reindent.py

11.48 KB

-rw-rw-rw-

rgrep.py

1.52 KB

-rw-rw-rw-

serve.py

1.15 KB

-rw-rw-rw-

setup.py

441 B

-rw-rw-rw-

suff.py

652 B

-rw-rw-rw-

svneol.py

2.95 KB

-rw-rw-rw-

texcheck.py

9.27 KB

-rw-rw-rw-

texi2html.py

70.22 KB

-rw-rw-rw-

treesync.py

5.85 KB

-rw-rw-rw-

untabify.py

1.24 KB

-rw-rw-rw-

which.py

1.65 KB

-rw-rw-rw-

win_add2path.py

1.64 KB

-rw-rw-rw-

xxci.py

2.85 KB

-rw-rw-rw-

Code Editor : diff.py

#!/usr/bin/env python
""" Command line interface to difflib.py providing diffs in four formats:

* ndiff:    lists every line and highlights interline changes.
* context:  highlights clusters of changes in a before/after format.
* unified:  highlights clusters of changes in an inline format.
* html:     generates side by side comparison with change highlights.

"""

import sys, os, time, difflib, optparse

def main():

usage = "usage: %prog [options] fromfile tofile"
    parser = optparse.OptionParser(usage)
    parser.add_option("-c", action="store_true", default=False, help='Produce a context format diff (default)')
    parser.add_option("-u", action="store_true", default=False, help='Produce a unified format diff')
    parser.add_option("-m", action="store_true", default=False, help='Produce HTML side by side diff (can use -c and -l in conjunction)')
    parser.add_option("-n", action="store_true", default=False, help='Produce a ndiff format diff')
    parser.add_option("-l", "--lines", type="int", default=3, help='Set number of context lines (default 3)')
    (options, args) = parser.parse_args()

if len(args) == 0:
        parser.print_help()
        sys.exit(1)
    if len(args) != 2:
        parser.error("need to specify both a fromfile and tofile")

n = options.lines
    fromfile, tofile = args

fromdate = time.ctime(os.stat(fromfile).st_mtime)
    todate = time.ctime(os.stat(tofile).st_mtime)
    with open(fromfile, 'U') as f:
        fromlines = f.readlines()
    with open(tofile, 'U') as f:
        tolines = f.readlines()

if options.u:
        diff = difflib.unified_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n)
    elif options.n:
        diff = difflib.ndiff(fromlines, tolines)
    elif options.m:
        diff = difflib.HtmlDiff().make_file(fromlines,tolines,fromfile,tofile,context=options.c,numlines=n)
    else:
        diff = difflib.context_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n)

sys.stdout.writelines(diff)

if __name__ == '__main__':
    main()

${this.title}

Code Editor : diff.py