Jon Nelson <jnelson@users.sourceforge.net>:

Make the documentation tools work with Python 1.5.2.
[Slightly modified from submitted patch. --FLD]

This closes SF bug #132005.

diff --git a/Doc/tools/mkackshtml b/Doc/tools/mkackshtml
index 36f4d2a9b0c777ebcdad1d34f27ac91fa6d89788..917b3035f2eeae2a3db6457b1698a15714b27f39 100755 (executable)
--- a/Doc/tools/mkackshtml
+++ b/Doc/tools/mkackshtml
@@ -1,6 +1,7 @@
 #! /usr/bin/env python
 #  -*- Python -*-
 
+import string
 import support
 import sys
 
@@ -11,7 +12,7 @@ def collect(fp):
         line = fp.readline()
         if not line:
             break
-        line = line.strip()
+        line = string.strip(line)
         if line:
             names.append(line)
         else:
@@ -26,22 +27,24 @@ def main():
     options.parse(sys.argv[1:])
     names = collect(sys.stdin)
     percol = (len(names) + options.columns - 1) / options.columns
-    colnums = [percol*i for i in range(options.columns)]
+    colnums = []
+    for i in range(options.columns):
+        colnums.append(percol*i)
     fp = options.get_output_file()
-    print >>fp, options.get_header().rstrip()
-    print >>fp, THANKS
-    print >>fp, '<table width="100%" align="center">'
+    fp.write(string.rstrip(options.get_header()) + "\n")
+    fp.write(THANKS + "\n")
+    fp.write('<table width="100%" align="center">\n')
     for i in range(percol):
-        print >>fp, "  <tr>"
+        fp.write("  <tr>\n")
         for j in colnums:
             try:
-                print >>fp, "    <td>%s</td>" % names[i + j]
+                fp.write("    <td>%s</td>\n" % names[i + j])
             except IndexError:
-                print >>fp, "    <td>&nbsp;</td>"
-        print >>fp, "  </tr>"
-    print >>fp, "</table>"
-    print >>fp, options.get_footer().rstrip()
-
+                pass
+        fp.write("  </tr>\n")
+    fp.write("</table>\n")
+    fp.write(string.rstrip(options.get_footer()) + "\n")
+    fp.close()
 
 THANKS = '''\
 

diff --git a/Doc/tools/mkmodindex b/Doc/tools/mkmodindex
index b0211a7586ba94634c4c3e1087cbf105d83cb1e2..5f2da0ebc168b5b7e20b23744683f5c74cffd79f 100755 (executable)
--- a/Doc/tools/mkmodindex
+++ b/Doc/tools/mkmodindex
@@ -52,8 +52,8 @@ class Node(buildindex.Node):
     annotation = ""
 
     def __init__(self, link, str, seqno):
-        parts = str.split(None, 1)
-        if parts[0].endswith("</tt>"):
+        parts = string.split(str, None, 1)
+        if parts[0][-5:] == "</tt>":
             self.modname = parts[0][:-5]
         else:
             self.modname = parts[0]