[Python-bugs-list] [Bug #131725] Making documentation requires Python 2.0+
noreply@sourceforge.net
noreply@sourceforge.net
Mon, 12 Feb 2001 08:25:08 -0800
Bug #131725, was updated on 2001-Feb-09 07:07
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+
Details: The python scripts which come with the Python2.1a2
tarball require features not available in Python 1.5.2
Also, the scripts use /usr/bin/env python
instead of
/usr/bin/env python{1.6,2.0,2.1} etc...
A patch is included.
diff -u -r Python-2.1a2/Doc/tools/mkhowto
foo/Python-2.1a2/Doc/tools/mkhowto
--- Python-2.1a2/Doc/tools/mkhowto Tue Jan 30 16:30:01 2001
+++ foo/Python-2.1a2/Doc/tools/mkhowto Fri Feb 9 08:25:42 2001
@@ -297,7 +297,7 @@
# let the doctype-specific handler do some intermediate
work:
#
self.run("%s %s" % (binary, self.doc))
- self.latex_runs += 1
+ self.latex_runs = self.latex_runs + 1
if os.path.isfile("mod%s.idx" % self.doc):
self.run("%s -s %s mod%s.idx"
% (MAKEINDEX_BINARY, ISTFILE, self.doc))
@@ -319,7 +319,7 @@
if self.use_bibtex:
self.run("%s %s" % (BIBTEX_BINARY, self.doc))
self.run("%s %s" % (binary, self.doc))
- self.latex_runs += 1
+ self.latex_runs = self.latex_runs + 1
def process_synopsis_files(self):
synopsis_files = glob.glob(self.doc + "*.syn")
diff -u -r Python-2.1a2/Doc/tools/mkmodindex
foo/Python-2.1a2/Doc/tools/mkmodindex
--- Python-2.1a2/Doc/tools/mkmodindex Tue Nov 28 10:20:50 2000
+++ foo/Python-2.1a2/Doc/tools/mkmodindex Fri Feb 9 08:27:30 2001
@@ -117,9 +117,9 @@
html = string.join(parts, '')
program = os.path.basename(sys.argv[0])
fp = options.get_output_file()
- print >>fp, html.rstrip()
+ fp.write( html.rstrip() + "\n" )
if options.outputfile == "-":
- print >>sys.stderr, "%s: %d index nodes" % (program, num_nodes)
+ sys.stderr.write("%s: %d index nodes\n" % (program, num_nodes))
else:
print
print "%s: %d index nodes" % (program, num_nodes)
diff -u -r Python-2.1a2/Doc/tools/support.py
foo/Python-2.1a2/Doc/tools/support.py
--- Python-2.1a2/Doc/tools/support.py Thu Oct 5 00:20:55 2000
+++ foo/Python-2.1a2/Doc/tools/support.py Fri Feb 9 08:32:50 2001
@@ -9,6 +9,7 @@
import getopt
import sys
+import string
class Options:
@@ -37,9 +38,9 @@
def add_args(self, short=None, long=None):
if short:
- self.__short_args += short
+ self.__short_args = self.__short_args + short
if long:
- self.__long_args += long
+ self.__long_args = self.__long_args + long
def parse(self, args):
try:
@@ -49,10 +50,10 @@
sys.stdout = sys.stderr
self.usage()
sys.exit(2)
- self.args += args
+ self.args = self.args + args
for opt, val in opts:
if opt in ("-a", "--address"):
- val = val.strip()
+ val = string.strip(val)
if val:
val = "<address>\n%s\n</address>\n" % val
self.variables["address"] = val
Follow-Ups:
Date: 2001-Feb-12 08:25
By: jnelson
Comment:
Here's more to make it finish under 1.5.2:
Sorry for the horrible formatting.
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> </td>"
- print >>fp, " </tr>"
- print >>fp, options.get_footer().rstrip()
-
+ fp.write(" <td> </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]
-------------------------------------------------------
Date: 2001-Feb-12 07:32
By: fdrake
Comment:
Checked in a very slightly modified version of the patch as
Doc/tools/mkhowto revision 1.22, Doc/tools/mkmodindex revision 1.10, and
Doc/tools/support.py revision 1.3.
Thanks!
-------------------------------------------------------
For detailed info, follow this link:
http://sourceforge.net/bugs/?func=detailbug&bug_id=131725&group_id=5470