Initial revision

diff --git a/Tools/scripts/fixps.py b/Tools/scripts/fixps.py
new file mode 100755 (executable)
index 0000000..c5e4cb3
--- /dev/null
+++ b/Tools/scripts/fixps.py
@@ -0,0 +1,32 @@
+#! /usr/local/bin/python
+
+# Fix Python script(s) to reference the interpreter in /usr/local/bin.
+
+import sys
+import regex
+import regsub
+
+
+def main():
+       for file in sys.argv[1:]:
+               try:
+                       f = open(file, 'r+')
+               except IOError:
+                       print f, ': can\'t open for update'
+                       continue
+               line = f.readline()
+               if regex.match('^#! */usr/local/python', line) < 0:
+                       print file, ': not a /usr/local/python script'
+                       f.close()
+                       continue
+               rest = f.read()
+               line = regsub.sub('/usr/local/python', \
+                       '/usr/local/bin/python', line)
+               print file, ':', `line`
+               f.seek(0)
+               f.write(line)
+               f.write(rest)
+               f.close()
+
+
+main()

diff --git a/Tools/scripts/methfix.py b/Tools/scripts/methfix.py
new file mode 100755 (executable)
index 0000000..3d6d4f1
--- /dev/null
+++ b/Tools/scripts/methfix.py
@@ -0,0 +1,174 @@
+#! /ufs/guido/bin/sgi/python
+#! /usr/local/bin/python
+
+# Fix Python source files to avoid using 
+#      def method(self, (arg1, ..., argn)):
+# instead of the more rational
+#      def method(self, arg1, ..., argn):
+#
+# Command line arguments are files or directories to be processed.
+# Directories are searched recursively for files whose name looks
+# like a python module.
+# Symbolic links are always ignored (except as explicit directory
+# arguments).  Of course, the original file is kept as a back-up
+# (with a "~" attached to its name).
+# It complains about binaries (files containing null bytes)
+# and about files that are ostensibly not Python files: if the first
+# line starts with '#!' and does not contain the string 'python'.
+#
+# Changes made are reported to stdout in a diff-like format.
+#
+# Undoubtedly you can do this using find and sed or perl, but this is
+# a nice example of Python code that recurses down a directory tree
+# and uses regular expressions.  Also note several subtleties like
+# preserving the file's mode and avoiding to even write a temp file
+# when no changes are needed for a file.
+#
+# NB: by changing only the function fixline() you can turn this
+# into a program for a different change to Python programs...
+
+import sys
+import regex
+import os
+from stat import *
+import string
+
+err = sys.stderr.write
+dbg = err
+rep = sys.stdout.write
+
+def main():
+       bad = 0
+       if not sys.argv[1:]: # No arguments
+               err('usage: ' + argv[0] + ' file-or-directory ...\n')
+               sys.exit(2)
+       for arg in sys.argv[1:]:
+               if os.path.isdir(arg):
+                       if recursedown(arg): bad = 1
+               elif os.path.islink(arg):
+                       err(arg + ': will not process symbolic links\n')
+                       bad = 1
+               else:
+                       if fix(arg): bad = 1
+       sys.exit(bad)
+
+ispythonprog = regex.compile('^[a-zA-Z0-9_]+\.py$')
+def ispython(name):
+       return ispythonprog.match(name) >= 0
+
+def recursedown(dirname):
+       dbg('recursedown(' + `dirname` + ')\n')
+       bad = 0
+       try:
+               names = os.listdir(dirname)
+       except os.error, msg:
+               err(dirname + ': cannot list directory: ' + `msg` + '\n')
+               return 1
+       names.sort()
+       subdirs = []
+       for name in names:
+               if name in (os.curdir, os.pardir): continue
+               fullname = os.path.join(dirname, name)
+               if os.path.islink(fullname): pass
+               elif os.path.isdir(fullname):
+                       subdirs.append(fullname)
+               elif ispython(name):
+                       if fix(fullname): bad = 1
+       for fullname in subdirs:
+               if recursedown(fullname): bad = 1
+       return bad
+
+def fix(filename):
+##     dbg('fix(' + `filename` + ')\n')
+       try:
+               f = open(filename, 'r')
+       except IOError, msg:
+               err(filename + ': cannot open: ' + `msg` + '\n')
+               return 1
+       head, tail = os.path.split(filename)
+       tempname = os.path.join(head, '@' + tail)
+       g = None
+       # If we find a match, we rewind the file and start over but
+       # now copy everything to a temp file.
+       lineno = 0
+       while 1:
+               line = f.readline()
+               if not line: break
+               lineno = lineno + 1
+               if g is None and '\0' in line:
+                       # Check for binary files
+                       err(filename + ': contains null bytes; not fixed\n')
+                       f.close()
+                       return 1
+               if lineno == 1 and g is None and line[:2] == '#!':
+                       # Check for non-Python scripts
+                       words = string.split(line[2:])
+                       if words and regex.search('[pP]ython', words[0]) < 0:
+                               msg = filename + ': ' + words[0]
+                               msg = msg + ' script; not fixed\n'
+                               err(msg)
+                               f.close()
+                               return 1
+               while line[-2:] == '\\\n':
+                       nextline = f.readline()
+                       if not nextline: break
+                       line = line + nextline
+                       lineno = lineno + 1
+               newline = fixline(line)
+               if newline != line:
+                       if g is None:
+                               try:
+                                       g = open(tempname, 'w')
+                               except IOError, msg:
+                                       f.close()
+                                       err(tempname+': cannot create: '+\
+                                           `msg`+'\n')
+                                       return 1
+                               f.seek(0)
+                               lineno = 0
+                               rep(filename + ':\n')
+                               continue # restart from the beginning
+                       rep(`lineno` + '\n')
+                       rep('< ' + line)
+                       rep('> ' + newline)
+               if g is not None:
+                       g.write(newline)
+
+       # End of file
+       f.close()
+       if not g: return 0 # No changes
+       
+       # Finishing touch -- move files
+
+       # First copy the file's mode to the temp file
+       try:
+               statbuf = os.stat(filename)
+               os.chmod(tempname, statbuf[ST_MODE] & 07777)
+       except os.error, msg:
+               err(tempname + ': warning: chmod failed (' + `msg` + ')\n')
+       # Then make a backup of the original file as filename~
+       try:
+               os.rename(filename, filename + '~')
+       except os.error, msg:
+               err(filename + ': warning: backup failed (' + `msg` + ')\n')
+       # Now move the temp file to the original file
+       try:
+               os.rename(tempname, filename)
+       except os.error, msg:
+               err(filename + ': rename failed (' + `msg` + ')\n')
+               return 1
+       # Return succes
+       return 0
+
+
+fixpat = '^[ \t]+def +[a-zA-Z0-9_]+ *( *self *, *\(( *\(.*\) *)\) *) *:'
+fixprog = regex.compile(fixpat)
+
+def fixline(line):
+       if fixprog.match(line) >= 0:
+               (a, b), (c, d) = fixprog.regs[1:3]
+               line = line[:a] + line[c:d] + line[b:]
+       return line
+
+
+main()