[Python-bugs-list] [Bug #132005] Making documentation requires Python 2.0+ (II)

[noreply@sourceforge.net]

Bug #132005, was updated on 2001-Feb-12 08:28
Here is a current snapshot of the bug.

Project: Python
Category: Documentation
Status: Closed
Resolution: Fixed
Bug Group: None
Priority: 5
Submitted by: jnelson
Assigned to : fdrake
Summary: Making documentation requires Python 2.0+ (II)

Details: Additional patching for #131725.
This should complete the patching necessary to make
it work under 1.5.2

Index: dist/src/Doc/tools/mkackshtml
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/mkackshtml,v
retrieving revision 1.1
diff -u -r1.1 mkackshtml
--- dist/src/Doc/tools/mkackshtml       2000/10/05 05:15:29     1.1
+++ dist/src/Doc/tools/mkackshtml       2001/02/12 16:16:47
@@ -3,15 +3,15 @@
 
 import support
 import sys
+import string
 
-
 def collect(fp):
     names = []
     while 1:
         line = fp.readline()
         if not line:
             break
-        line = line.strip()
+        line = string.strip(line)
         if line:
             names.append(line)
         else:
@@ -26,22 +26,25 @@
     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)
+#    colnums = [percol*i for i in range(options.columns)]
     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()
-
+                fp.write("    <td>&nbsp;</td>\n")
+        fp.write("  </tr>\n")
+    fp.write("</table>\n")
+    fp.write(string.rstrip(options.get_footer()) + "\n")
+    fp.close()
 
 THANKS = '''\
 
Index: dist/src/Doc/tools/mkmodindex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/mkmodindex,v
retrieving revision 1.10
diff -u -r1.10 mkmodindex
--- dist/src/Doc/tools/mkmodindex       2001/02/12 15:30:22     1.10
+++ dist/src/Doc/tools/mkmodindex       2001/02/12 16:16:47
@@ -52,8 +52,8 @@
     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]


Follow-Ups:

Date: 2001-Feb-12 11:14
By: fdrake

Comment:
Patches should really be submitted via the patch manager!

Checked in a slightly modified patch as Doc/tools/mkackshtml revision 1.2
and Doc/tools/mkmodindex revision 1.11.

Thanks!
-------------------------------------------------------

Date: 2001-Feb-12 10:36
By: fdrake

Comment:
Assigned to me, mostly to get SF to mail me the patch.
-------------------------------------------------------

For detailed info, follow this link:
http://sourceforge.net/bugs/?func=detailbug&bug_id=132005&group_id=5470