summaryrefslogtreecommitdiffstats
path: root/Tools/scripts/diff.py
diff options
context:
space:
mode:
authorAndrew M. Kuchling <amk@amk.ca>2004-08-09 17:27:55 (GMT)
committerAndrew M. Kuchling <amk@amk.ca>2004-08-09 17:27:55 (GMT)
commite236b38731823aeb87bb6d101062f54a72044954 (patch)
tree6283b4999bb585c11ae1dfeb87dfb6e083f78e6c /Tools/scripts/diff.py
parent6c542b731cfe3e17991643bfc41bb785331e7e5c (diff)
downloadcpython-e236b38731823aeb87bb6d101062f54a72044954.zip
cpython-e236b38731823aeb87bb6d101062f54a72044954.tar.gz
cpython-e236b38731823aeb87bb6d101062f54a72044954.tar.bz2
[Patch #1005491 ] use __name__ == '__main__' in scripts
Diffstat (limited to 'Tools/scripts/diff.py')
-rw-r--r--Tools/scripts/diff.py65
1 files changed, 35 insertions, 30 deletions
diff --git a/Tools/scripts/diff.py b/Tools/scripts/diff.py
index d452668..ecbff61 100644
--- a/Tools/scripts/diff.py
+++ b/Tools/scripts/diff.py
@@ -8,33 +8,38 @@
import sys, os, time, difflib, optparse
-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("-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)
-fromlines = open(fromfile).readlines()
-tolines = open(tofile).readlines()
-
-if options.u:
- diff = difflib.unified_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n)
-elif options.n:
- diff = difflib.ndiff(fromlines, tolines)
-else:
- diff = difflib.context_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n)
-
-sys.stdout.writelines(diff)
+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("-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)
+ fromlines = open(fromfile).readlines()
+ tolines = open(tofile).readlines()
+
+ if options.u:
+ diff = difflib.unified_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n)
+ elif options.n:
+ diff = difflib.ndiff(fromlines, tolines)
+ else:
+ diff = difflib.context_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n)
+
+ sys.stdout.writelines(diff)
+
+if __name__ == '__main__':
+ main()