[Python-checkins] python/dist/src/Tools/scripts byteyears.py, 1.10,
1.11 checkpyc.py, 1.10, 1.11 classfix.py, 1.13,
1.14 copytime.py, 1.5, 1.6 crlf.py, 1.4, 1.5 cvsfiles.py, 1.5,
1.6 diff.py, 1.2, 1.3 dutree.py, 1.13, 1.14 findlinksto.py,
1.9, 1.10 fixcid.py, 1.11, 1.12 fixheader.py, 1.6,
1.7 fixps.py, 1.7, 1.8 google.py, 1.2, 1.3 gprof2html.py, 1.1,
1.2 h2py.py, 1.18, 1.19 idle, 1.1, 1.2 ifdef.py, 1.6,
1.7 lfcr.py, 1.4, 1.5 linktree.py, 1.6, 1.7 lll.py, 1.5,
1.6 logmerge.py, 1.12, 1.13 methfix.py, 1.8, 1.9 mkreal.py,
1.7, 1.8 objgraph.py, 1.7, 1.8 pathfix.py, 1.6, 1.7 pdeps.py,
1.6, 1.7 ptags.py, 1.8, 1.9 pydoc, 1.2, 1.3 pydocgui.pyw, 1.1,
1.2 setup.py, 1.3, 1.4 suff.py, 1.7, 1.8 treesync.py, 1.6,
1.7 which.py, 1.13, 1.14 xxci.py, 1.15, 1.16
akuchling at users.sourceforge.net
akuchling at users.sourceforge.net
Mon Aug 9 19:28:03 CEST 2004
Update of /cvsroot/python/python/dist/src/Tools/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12113
Modified Files:
byteyears.py checkpyc.py classfix.py copytime.py crlf.py
cvsfiles.py diff.py dutree.py findlinksto.py fixcid.py
fixheader.py fixps.py google.py gprof2html.py h2py.py idle
ifdef.py lfcr.py linktree.py lll.py logmerge.py methfix.py
mkreal.py objgraph.py pathfix.py pdeps.py ptags.py pydoc
pydocgui.pyw setup.py suff.py treesync.py which.py xxci.py
Log Message:
[Patch #1005491 ] use __name__ == '__main__' in scripts
Index: byteyears.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/byteyears.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** byteyears.py 12 Feb 2004 17:35:31 -0000 1.10
--- byteyears.py 9 Aug 2004 17:27:55 -0000 1.11
***************
*** 10,56 ****
from stat import *
! # Use lstat() to stat files if it exists, else stat()
! try:
! statfunc = os.lstat
! except AttributeError:
! statfunc = os.stat
! # Parse options
! if sys.argv[1] == '-m':
! itime = ST_MTIME
! del sys.argv[1]
! elif sys.argv[1] == '-c':
! itime = ST_CTIME
! del sys.argv[1]
! elif sys.argv[1] == '-a':
! itime = ST_CTIME
! del sys.argv[1]
! else:
! itime = ST_MTIME
! secs_per_year = 365.0 * 24.0 * 3600.0 # Scale factor
! now = time.time() # Current time, for age computations
! status = 0 # Exit status, set to 1 on errors
! # Compute max file name length
! maxlen = 1
! for filename in sys.argv[1:]:
! maxlen = max(maxlen, len(filename))
! # Process each argument in turn
! for filename in sys.argv[1:]:
! try:
! st = statfunc(filename)
! except os.error, msg:
! sys.stderr.write("can't stat %r: %r\n" % (filename, msg))
! status = 1
! st = ()
! if st:
! anytime = st[itime]
! size = st[ST_SIZE]
! age = now - anytime
! byteyears = float(size) * float(age) / secs_per_year
! print filename.ljust(maxlen),
! print repr(int(byteyears)).rjust(8)
! sys.exit(status)
--- 10,61 ----
from stat import *
! def main():
! # Use lstat() to stat files if it exists, else stat()
! try:
! statfunc = os.lstat
! except AttributeError:
! statfunc = os.stat
! # Parse options
! if sys.argv[1] == '-m':
! itime = ST_MTIME
! del sys.argv[1]
! elif sys.argv[1] == '-c':
! itime = ST_CTIME
! del sys.argv[1]
! elif sys.argv[1] == '-a':
! itime = ST_CTIME
! del sys.argv[1]
! else:
! itime = ST_MTIME
! secs_per_year = 365.0 * 24.0 * 3600.0 # Scale factor
! now = time.time() # Current time, for age computations
! status = 0 # Exit status, set to 1 on errors
! # Compute max file name length
! maxlen = 1
! for filename in sys.argv[1:]:
! maxlen = max(maxlen, len(filename))
! # Process each argument in turn
! for filename in sys.argv[1:]:
! try:
! st = statfunc(filename)
! except os.error, msg:
! sys.stderr.write("can't stat %r: %r\n" % (filename, msg))
! status = 1
! st = ()
! if st:
! anytime = st[itime]
! size = st[ST_SIZE]
! age = now - anytime
! byteyears = float(size) * float(age) / secs_per_year
! print filename.ljust(maxlen),
! print repr(int(byteyears)).rjust(8)
!
! sys.exit(status)
!
! if __name__ == '__main__':
! main()
Index: checkpyc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/checkpyc.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** checkpyc.py 12 Feb 2004 17:35:31 -0000 1.10
--- checkpyc.py 9 Aug 2004 17:27:55 -0000 1.11
***************
*** 63,65 ****
return ord(s[0]) + (ord(s[1])<<8) + (ord(s[2])<<16) + (ord(s[3])<<24)
! main()
--- 63,66 ----
return ord(s[0]) + (ord(s[1])<<8) + (ord(s[2])<<16) + (ord(s[3])<<24)
! if __name__ == '__main__':
! main()
Index: classfix.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/classfix.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** classfix.py 12 Feb 2004 17:35:31 -0000 1.13
--- classfix.py 9 Aug 2004 17:27:55 -0000 1.14
***************
*** 187,189 ****
return head + '(' + basepart + '):' + tail
! main()
--- 187,190 ----
return head + '(' + basepart + '):' + tail
! if __name__ == '__main__':
! main()
Index: copytime.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/copytime.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** copytime.py 17 Jan 2001 08:48:39 -0000 1.5
--- copytime.py 9 Aug 2004 17:27:55 -0000 1.6
***************
*** 23,25 ****
sys.exit(2)
! main()
--- 23,26 ----
sys.exit(2)
! if __name__ == '__main__':
! main()
Index: crlf.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/crlf.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** crlf.py 13 May 2003 14:51:39 -0000 1.4
--- crlf.py 9 Aug 2004 17:27:55 -0000 1.5
***************
*** 1,19 ****
#! /usr/bin/env python
-
"Replace CRLF with LF in argument files. Print names of changed files."
import sys, os
! for filename in sys.argv[1:]:
! if os.path.isdir(filename):
! print filename, "Directory!"
! continue
! data = open(filename, "rb").read()
! if '\0' in data:
! print filename, "Binary!"
! continue
! newdata = data.replace("\r\n", "\n")
! if newdata != data:
! print filename
! f = open(filename, "wb")
! f.write(newdata)
! f.close()
--- 1,24 ----
#! /usr/bin/env python
"Replace CRLF with LF in argument files. Print names of changed files."
import sys, os
!
! def main():
! for filename in sys.argv[1:]:
! if os.path.isdir(filename):
! print filename, "Directory!"
! continue
! data = open(filename, "rb").read()
! if '\0' in data:
! print filename, "Binary!"
! continue
! newdata = data.replace("\r\n", "\n")
! if newdata != data:
! print filename
! f = open(filename, "wb")
! f.write(newdata)
! f.close()
!
! if __name__ == '__main__':
! main()
!
Index: cvsfiles.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/cvsfiles.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** cvsfiles.py 11 Sep 2002 20:36:01 -0000 1.5
--- cvsfiles.py 9 Aug 2004 17:27:55 -0000 1.6
***************
*** 69,71 ****
return st[stat.ST_MTIME]
! sys.exit(main())
--- 69,72 ----
return st[stat.ST_MTIME]
! if __name__ == '__main__':
! main()
Index: diff.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/diff.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** diff.py 8 Jul 2004 04:22:20 -0000 1.2
--- diff.py 9 Aug 2004 17:27:55 -0000 1.3
***************
*** 9,40 ****
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)
--- 9,45 ----
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("-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()
Index: dutree.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/dutree.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** dutree.py 12 Feb 2004 17:35:31 -0000 1.13
--- dutree.py 9 Aug 2004 17:27:55 -0000 1.14
***************
*** 57,59 ****
show(tsub, d[key][1], psub)
! main()
--- 57,60 ----
show(tsub, d[key][1], psub)
! if __name__ == '__main__':
! main()
Index: findlinksto.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/findlinksto.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** findlinksto.py 6 Feb 2003 19:55:35 -0000 1.9
--- findlinksto.py 9 Aug 2004 17:27:55 -0000 1.10
***************
*** 40,42 ****
pass
! main()
--- 40,43 ----
pass
! if __name__ == '__main__':
! main()
Index: fixcid.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/fixcid.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** fixcid.py 12 Feb 2004 17:35:31 -0000 1.11
--- fixcid.py 9 Aug 2004 17:27:55 -0000 1.12
***************
*** 311,313 ****
fp.close()
! main()
--- 311,314 ----
fp.close()
! if __name__ == '__main__':
! main()
Index: fixheader.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/fixheader.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fixheader.py 13 May 2003 18:14:24 -0000 1.6
--- fixheader.py 9 Aug 2004 17:27:55 -0000 1.7
***************
*** 46,48 ****
print '#endif /*', '!'+magic, '*/'
! main()
--- 46,49 ----
print '#endif /*', '!'+magic, '*/'
! if __name__ == '__main__':
! main()
Index: fixps.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/fixps.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** fixps.py 12 Feb 2004 17:35:31 -0000 1.7
--- fixps.py 9 Aug 2004 17:27:55 -0000 1.8
***************
*** 30,33 ****
f.close()
!
! main()
--- 30,33 ----
f.close()
! if __name__ == '__main__':
! main()
Index: google.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/google.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** google.py 8 Feb 2002 16:20:07 -0000 1.2
--- google.py 9 Aug 2004 17:27:55 -0000 1.3
***************
*** 20,22 ****
webbrowser.open(url)
! main()
--- 20,23 ----
webbrowser.open(url)
! if __name__ == '__main__':
! main()
Index: gprof2html.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/gprof2html.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gprof2html.py 9 Aug 2002 20:07:34 -0000 1.1
--- gprof2html.py 9 Aug 2004 17:27:55 -0000 1.2
***************
*** 76,78 ****
webbrowser.open("file:" + os.path.abspath(outputfilename))
! main()
--- 76,79 ----
webbrowser.open("file:" + os.path.abspath(outputfilename))
! if __name__ == '__main__':
! main()
Index: h2py.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/h2py.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** h2py.py 23 Nov 2002 12:08:10 -0000 1.18
--- h2py.py 9 Aug 2004 17:27:55 -0000 1.19
***************
*** 172,174 ****
filename)
! main()
--- 172,175 ----
filename)
! if __name__ == '__main__':
! main()
Index: idle
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/idle,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** idle 13 Jun 2003 20:34:27 -0000 1.1
--- idle 9 Aug 2004 17:27:55 -0000 1.2
***************
*** 2,4 ****
from idlelib.PyShell import main
! main()
--- 2,5 ----
from idlelib.PyShell import main
! if __name__ == '__main__':
! main()
Index: ifdef.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/ifdef.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ifdef.py 13 May 2003 18:14:24 -0000 1.6
--- ifdef.py 9 Aug 2004 17:27:55 -0000 1.7
***************
*** 110,112 ****
sys.stderr.write('stack: %s\n' % stack)
! main()
--- 110,113 ----
sys.stderr.write('stack: %s\n' % stack)
! if __name__ == '__main__':
! main()
Index: lfcr.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/lfcr.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** lfcr.py 13 May 2003 17:09:01 -0000 1.4
--- lfcr.py 9 Aug 2004 17:27:55 -0000 1.5
***************
*** 4,19 ****
import sys, re, os
! for filename in sys.argv[1:]:
! if os.path.isdir(filename):
! print filename, "Directory!"
! continue
! data = open(filename, "rb").read()
! if '\0' in data:
! print filename, "Binary!"
! continue
! newdata = re.sub("\r?\n", "\r\n", data)
! if newdata != data:
! print filename
! f = open(filename, "wb")
! f.write(newdata)
! f.close()
--- 4,24 ----
import sys, re, os
!
! def main():
! for filename in sys.argv[1:]:
! if os.path.isdir(filename):
! print filename, "Directory!"
! continue
! data = open(filename, "rb").read()
! if '\0' in data:
! print filename, "Binary!"
! continue
! newdata = re.sub("\r?\n", "\r\n", data)
! if newdata != data:
! print filename
! f = open(filename, "wb")
! f.write(newdata)
! f.close()
!
! if __name__ == '__main__':
! main()
Index: linktree.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/linktree.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** linktree.py 17 Jan 2001 08:48:39 -0000 1.6
--- linktree.py 9 Aug 2004 17:27:55 -0000 1.7
***************
*** 77,79 ****
os.symlink(linkname, newname)
! sys.exit(main())
--- 77,80 ----
os.symlink(linkname, newname)
! if __name__ == '__main__':
! sys.exit(main())
Index: lll.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/lll.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** lll.py 17 Jan 2001 08:48:39 -0000 1.5
--- lll.py 9 Aug 2004 17:27:55 -0000 1.6
***************
*** 14,25 ****
if os.path.islink(full):
print name, '->', os.readlink(full)
!
! args = sys.argv[1:]
! if not args: args = [os.curdir]
! first = 1
! for arg in args:
! if len(args) > 1:
! if not first: print
! first = 0
! print arg + ':'
lll(arg)
--- 14,29 ----
if os.path.islink(full):
print name, '->', os.readlink(full)
! def main():
! args = sys.argv[1:]
! if not args: args = [os.curdir]
! first = 1
! for arg in args:
! if len(args) > 1:
! if not first: print
! first = 0
! print arg + ':'
lll(arg)
+
+ if __name__ == '__main__':
+ main()
+
Index: logmerge.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/logmerge.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** logmerge.py 14 Aug 2003 15:52:33 -0000 1.12
--- logmerge.py 9 Aug 2004 17:27:55 -0000 1.13
***************
*** 178,184 ****
prevtext = text
! try:
! main()
! except IOError, e:
! if e.errno != errno.EPIPE:
! raise
--- 178,185 ----
prevtext = text
! if __name__ == '__main__':
! try:
! main()
! except IOError, e:
! if e.errno != errno.EPIPE:
! raise
Index: methfix.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/methfix.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** methfix.py 12 Feb 2004 17:35:31 -0000 1.8
--- methfix.py 9 Aug 2004 17:27:55 -0000 1.9
***************
*** 168,171 ****
return line
!
! main()
--- 168,171 ----
return line
! if __name__ == '__main__':
! main()
Index: mkreal.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/mkreal.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mkreal.py 13 May 2003 18:14:25 -0000 1.7
--- mkreal.py 9 Aug 2004 17:27:55 -0000 1.8
***************
*** 63,65 ****
sys.exit(status)
! main()
--- 63,66 ----
sys.exit(status)
! if __name__ == '__main__':
! main()
Index: objgraph.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/objgraph.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** objgraph.py 13 May 2003 18:14:25 -0000 1.7
--- objgraph.py 9 Aug 2004 17:27:55 -0000 1.8
***************
*** 209,214 ****
# Catch interrupts to avoid stack trace.
#
! try:
! sys.exit(main())
! except KeyboardInterrupt:
! sys.exit(1)
--- 209,215 ----
# Catch interrupts to avoid stack trace.
#
! if __name__ == '__main__':
! try:
! sys.exit(main())
! except KeyboardInterrupt:
! sys.exit(1)
Index: pathfix.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/pathfix.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pathfix.py 12 Feb 2004 17:35:31 -0000 1.6
--- pathfix.py 9 Aug 2004 17:27:55 -0000 1.7
***************
*** 146,148 ****
return '#! %s\n' % new_interpreter
! main()
--- 146,150 ----
return '#! %s\n' % new_interpreter
! if __name__ == '__main__':
! main()
!
Index: pdeps.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/pdeps.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pdeps.py 11 Sep 2002 20:36:01 -0000 1.6
--- pdeps.py 9 Aug 2004 17:27:55 -0000 1.7
***************
*** 161,166 ****
# Call main and honor exit status
! try:
! sys.exit(main())
! except KeyboardInterrupt:
! sys.exit(1)
--- 161,167 ----
# Call main and honor exit status
! if __name__ == '__main__':
! try:
! sys.exit(main())
! except KeyboardInterrupt:
! sys.exit(1)
Index: ptags.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/ptags.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ptags.py 13 May 2003 18:14:25 -0000 1.8
--- ptags.py 9 Aug 2004 17:27:55 -0000 1.9
***************
*** 50,52 ****
tags.append(s)
! main()
--- 50,53 ----
tags.append(s)
! if __name__ == '__main__':
! main()
Index: pydoc
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/pydoc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pydoc 1 Mar 2001 00:25:40 -0000 1.2
--- pydoc 9 Aug 2004 17:27:55 -0000 1.3
***************
*** 2,4 ****
import pydoc
! pydoc.cli()
--- 2,5 ----
import pydoc
! if __name__ == '__main__':
! pydoc.cli()
Index: pydocgui.pyw
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/pydocgui.pyw,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pydocgui.pyw 5 Aug 2001 05:43:20 -0000 1.1
--- pydocgui.pyw 9 Aug 2004 17:27:55 -0000 1.2
***************
*** 3,5 ****
# between 2.2a1 and 2.2a2).
import pydoc
! pydoc.gui()
--- 3,7 ----
# between 2.2a1 and 2.2a2).
import pydoc
!
! if __name__ == '__main__':
! pydoc.gui()
Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/setup.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** setup.py 8 Apr 2003 19:50:02 -0000 1.3
--- setup.py 9 Aug 2004 17:27:55 -0000 1.4
***************
*** 1,18 ****
from distutils.core import setup
! setup(
! scripts=[
! 'byteyears.py',
! 'checkpyc.py',
! 'copytime.py',
! 'crlf.py',
! 'dutree.py',
! 'ftpmirror.py',
! 'h2py.py',
! 'lfcr.py',
! 'logmerge.py',
! '../../Lib/tabnanny.py',
! '../../Lib/timeit.py',
! 'untabify.py',
! ],
! )
--- 1,19 ----
from distutils.core import setup
! if __name__ == '__main__':
! setup(
! scripts=[
! 'byteyears.py',
! 'checkpyc.py',
! 'copytime.py',
! 'crlf.py',
! 'dutree.py',
! 'ftpmirror.py',
! 'h2py.py',
! 'lfcr.py',
! 'logmerge.py',
! '../../Lib/tabnanny.py',
! '../../Lib/timeit.py',
! 'untabify.py',
! ],
! )
Index: suff.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/suff.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** suff.py 12 Feb 2004 17:35:31 -0000 1.7
--- suff.py 9 Aug 2004 17:27:55 -0000 1.8
***************
*** 27,29 ****
return suff
! main()
--- 27,30 ----
return suff
! if __name__ == '__main__':
! main()
Index: treesync.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/treesync.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** treesync.py 11 Sep 2002 20:36:01 -0000 1.6
--- treesync.py 9 Aug 2004 17:27:55 -0000 1.7
***************
*** 202,204 ****
return okay(prompt)
! main()
--- 202,205 ----
return okay(prompt)
! if __name__ == '__main__':
! main()
Index: which.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/which.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** which.py 12 Feb 2004 17:35:32 -0000 1.13
--- which.py 9 Aug 2004 17:27:55 -0000 1.14
***************
*** 14,56 ****
sys.stderr.write(str + '\n')
! pathlist = os.environ['PATH'].split(os.pathsep)
! sts = 0
! longlist = ''
! if sys.argv[1:] and sys.argv[1][:2] == '-l':
! longlist = sys.argv[1]
! del sys.argv[1]
! for prog in sys.argv[1:]:
! ident = ()
! for dir in pathlist:
! filename = os.path.join(dir, prog)
! try:
! st = os.stat(filename)
! except os.error:
! continue
! if not S_ISREG(st[ST_MODE]):
! msg(filename + ': not a disk file')
! else:
! mode = S_IMODE(st[ST_MODE])
! if mode & 0111:
! if not ident:
! print filename
! ident = st[:3]
! else:
! if st[:3] == ident:
! s = 'same as: '
! else:
! s = 'also: '
! msg(s + filename)
else:
! msg(filename + ': not executable')
! if longlist:
! sts = os.system('ls ' + longlist + ' ' + filename)
! if sts: msg('"ls -l" exit status: ' + repr(sts))
! if not ident:
! msg(prog + ': not found')
! sts = 1
- sys.exit(sts)
--- 14,61 ----
sys.stderr.write(str + '\n')
! def main():
! pathlist = os.environ['PATH'].split(os.pathsep)
! sts = 0
! longlist = ''
! if sys.argv[1:] and sys.argv[1][:2] == '-l':
! longlist = sys.argv[1]
! del sys.argv[1]
! for prog in sys.argv[1:]:
! ident = ()
! for dir in pathlist:
! filename = os.path.join(dir, prog)
! try:
! st = os.stat(filename)
! except os.error:
! continue
! if not S_ISREG(st[ST_MODE]):
! msg(filename + ': not a disk file')
else:
! mode = S_IMODE(st[ST_MODE])
! if mode & 0111:
! if not ident:
! print filename
! ident = st[:3]
! else:
! if st[:3] == ident:
! s = 'same as: '
! else:
! s = 'also: '
! msg(s + filename)
! else:
! msg(filename + ': not executable')
! if longlist:
! sts = os.system('ls ' + longlist + ' ' + filename)
! if sts: msg('"ls -l" exit status: ' + repr(sts))
! if not ident:
! msg(prog + ': not found')
! sts = 1
!
! sys.exit(sts)
!
! if __name__ == '__main__':
! main()
Index: xxci.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/scripts/xxci.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** xxci.py 11 Sep 2002 20:36:01 -0000 1.15
--- xxci.py 9 Aug 2004 17:27:55 -0000 1.16
***************
*** 110,116 ****
return s in ['y', 'yes']
! try:
! setup()
! go(getargs())
! except KeyboardInterrupt:
! print '[Intr]'
--- 110,117 ----
return s in ['y', 'yes']
! if __name__ == '__main__':
! try:
! setup()
! go(getargs())
! except KeyboardInterrupt:
! print '[Intr]'
More information about the Python-checkins
mailing list