[Python-checkins] CVS: python/dist/src/Lib pydoc.py,1.18,1.19

[Ka-Ping Yee]

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv7800

Modified Files:
	pydoc.py 
Log Message:
Small formatting improvements.


Index: pydoc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pydoc.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** pydoc.py	2001/03/23 13:17:50	1.18
--- pydoc.py	2001/03/23 13:35:45	1.19
***************
*** 270,276 ****
  <tr bgcolor="%s">
  <td valign=bottom><small>&nbsp;<br></small
! ><font color="%s" face="helvetica">&nbsp;<br>%s</font></td
  ><td align=right valign=bottom
! ><font color="%s" face="helvetica">%s</font></td></tr></table>
      ''' % (bgcol, fgcol, title, fgcol, extras or '&nbsp;')
  
--- 270,276 ----
  <tr bgcolor="%s">
  <td valign=bottom><small>&nbsp;<br></small
! ><font color="%s" face="helvetica, arial">&nbsp;<br>%s</font></td
  ><td align=right valign=bottom
! ><font color="%s" face="helvetica, arial">%s</font></td></tr></table>
      ''' % (bgcol, fgcol, title, fgcol, extras or '&nbsp;')
  
***************
*** 288,294 ****
          if prelude:
              result = result + '''
! <tr bgcolor="%s"><td>%s</td>
! <td colspan=2>%s</td></tr>''' % (bgcol, marginalia, prelude)
!         result = result + '''
  <tr><td bgcolor="%s">%s</td><td>%s</td>''' % (bgcol, marginalia, gap)
  
--- 288,296 ----
          if prelude:
              result = result + '''
! <tr bgcolor="%s"><td rowspan=2>%s</td>
! <td colspan=2>%s</td></tr>
! <tr><td>%s</td>''' % (bgcol, marginalia, prelude, gap)
!         else:
!             result = result + '''
  <tr><td bgcolor="%s">%s</td><td>%s</td>''' % (bgcol, marginalia, gap)
  
***************
*** 557,561 ****
          doc = self.markup(
              getdoc(object), self.preformat, funcs, classes, mdict)
!         doc = self.small('<tt>%s<br>&nbsp;</tt>' % doc)
          return self.section(title, '#000000', '#ffc8d8', contents, 10, doc)
  
--- 559,563 ----
          doc = self.markup(
              getdoc(object), self.preformat, funcs, classes, mdict)
!         doc = self.small(doc and '<tt>%s<br>&nbsp;</tt>' % doc or '<tt>&nbsp;</tt>')
          return self.section(title, '#000000', '#ffc8d8', contents, 10, doc)
  
***************
*** 585,589 ****
              else:
                  note = (object.im_self and
!                         'method of ' + self.repr(object.im_self) or
                          ' unbound %s method' % object.im_class.__name__)
              object = object.im_func
--- 587,591 ----
              else:
                  note = (object.im_self and
!                         ' method of ' + self.repr(object.im_self) or
                          ' unbound %s method' % object.im_class.__name__)
              object = object.im_func
***************
*** 611,623 ****
                  argspec = argspec[1:-1] # remove parentheses
  
!         decl = title + argspec + (note and self.small(self.grey(note)))
  
          if skipdocs:
!             return '<dl><dt>%s</dl>' % decl
          else:
              doc = self.markup(
                  getdoc(object), self.preformat, funcs, classes, methods)
              doc = doc and '<tt>%s</tt>' % doc
!             return '<dl><dt>%s<dd>%s</dl>' % (decl, self.small(doc))
  
      def docother(self, object, name=None):
--- 613,626 ----
                  argspec = argspec[1:-1] # remove parentheses
  
!         decl = title + argspec + (note and self.small(self.grey(
!             '<font face="helvetica, arial">%s</font>' % note)))
  
          if skipdocs:
!             return '<dl><dt>%s</dl>\n' % decl
          else:
              doc = self.markup(
                  getdoc(object), self.preformat, funcs, classes, methods)
              doc = doc and '<tt>%s</tt>' % doc
!             return '<dl><dt>%s<dd>%s</dl>\n' % (decl, self.small(doc))
  
      def docother(self, object, name=None):