[Python-checkins] CVS: python/dist/src/Doc/tools mkhowto,1.21,1.22 mkmodindex,1.9,1.10 support.py,1.2,1.3

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Doc/tools
In directory usw-pr-cvs1:/tmp/cvs-serv4561

Modified Files:
	mkhowto mkmodindex support.py 
Log Message:

Jon Nelson <jnelson@users.sourceforge.net>:
Make the documentation tools compatibile with Python 2.0.


Index: mkhowto
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/mkhowto,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** mkhowto	2001/02/04 15:20:26	1.21
--- mkhowto	2001/02/12 15:30:22	1.22
***************
*** 298,302 ****
              #
              self.run("%s %s" % (binary, self.doc))
!             self.latex_runs += 1
              if os.path.isfile("mod%s.idx" % self.doc):
                  self.run("%s -s %s mod%s.idx"
--- 298,302 ----
              #
              self.run("%s %s" % (binary, self.doc))
!             self.latex_runs = self.latex_runs + 1
              if os.path.isfile("mod%s.idx" % self.doc):
                  self.run("%s -s %s mod%s.idx"
***************
*** 320,324 ****
              self.run("%s %s" % (BIBTEX_BINARY, self.doc))
          self.run("%s %s" % (binary, self.doc))
!         self.latex_runs += 1
  
      def process_synopsis_files(self):
--- 320,324 ----
              self.run("%s %s" % (BIBTEX_BINARY, self.doc))
          self.run("%s %s" % (binary, self.doc))
!         self.latex_runs = self.latex_runs + 1
  
      def process_synopsis_files(self):

Index: mkmodindex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/mkmodindex,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** mkmodindex	2000/11/28 16:20:50	1.9
--- mkmodindex	2001/02/12 15:30:22	1.10
***************
*** 118,124 ****
      program = os.path.basename(sys.argv[0])
      fp = options.get_output_file()
!     print >>fp, html.rstrip()
      if options.outputfile == "-":
!         print >>sys.stderr, "%s: %d index nodes" % (program, num_nodes)
      else:
          print
--- 118,124 ----
      program = os.path.basename(sys.argv[0])
      fp = options.get_output_file()
!     fp.write(string.rstrip(html) + "\n")
      if options.outputfile == "-":
!         sys.stderr.write("%s: %d index nodes\n" % (program, num_nodes))
      else:
          print

Index: support.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/support.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** support.py	2000/10/05 05:20:55	1.2
--- support.py	2001/02/12 15:30:22	1.3
***************
*** 9,12 ****
--- 9,13 ----
  
  import getopt
+ import string
  import sys
  
***************
*** 38,44 ****
      def add_args(self, short=None, long=None):
          if short:
!             self.__short_args += short
          if long:
!             self.__long_args += long
  
      def parse(self, args):
--- 39,45 ----
      def add_args(self, short=None, long=None):
          if short:
!             self.__short_args = self.__short_args + short
          if long:
!             self.__long_args = self.__long_args + long
  
      def parse(self, args):
***************
*** 50,57 ****
              self.usage()
              sys.exit(2)
!         self.args += args
          for opt, val in opts:
              if opt in ("-a", "--address"):
!                 val = val.strip()
                  if val:
                      val = "<address>\n%s\n</address>\n" % val
--- 51,58 ----
              self.usage()
              sys.exit(2)
!         self.args = self.args + args
          for opt, val in opts:
              if opt in ("-a", "--address"):
!                 val = string.strip(val)
                  if val:
                      val = "<address>\n%s\n</address>\n" % val