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

Tim Peters tim_one@users.sourceforge.net
Tue, 30 Oct 2001 20:20:28 -0800


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

Modified Files:
	pydoc.py 
Log Message:
SF patch #474485:  pydoc generates some bad html, from Rich Salz.


Index: pydoc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pydoc.py,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** pydoc.py	2001/10/18 19:56:16	1.55
--- pydoc.py	2001/10/31 04:20:26	1.56
***************
*** 332,336 ****
          """Format an HTML page."""
          return '''
! <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN">
  <html><head><title>Python: %s</title>
  <style type="text/css"><!--
--- 332,336 ----
          """Format an HTML page."""
          return '''
! <!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
  <html><head><title>Python: %s</title>
  <style type="text/css"><!--
***************
*** 343,347 ****
          """Format a page heading."""
          return '''
! <table width="100%%" cellspacing=0 cellpadding=2 border=0>
  <tr bgcolor="%s">
  <td valign=bottom>&nbsp;<br>
--- 343,347 ----
          """Format a page heading."""
          return '''
! <table width="100%%" cellspacing=0 cellpadding=2 border=0 summary="heading">
  <tr bgcolor="%s">
  <td valign=bottom>&nbsp;<br>
***************
*** 357,361 ****
              marginalia = '<tt>' + '&nbsp;' * width + '</tt>'
          result = '''
! <p><table width="100%%" cellspacing=0 cellpadding=2 border=0>
  <tr bgcolor="%s">
  <td colspan=3 valign=bottom>&nbsp;<br>
--- 357,361 ----
              marginalia = '<tt>' + '&nbsp;' * width + '</tt>'
          result = '''
! <table width="100%%" cellspacing=0 cellpadding=2 border=0 summary="section">
  <tr bgcolor="%s">
  <td colspan=3 valign=bottom>&nbsp;<br>
***************
*** 394,398 ****
                      result = result + format(list[i]) + '<br>\n'
              result = result + '</td>'
!         return '<table width="100%%"><tr>%s</tr></table>' % result
  
      def grey(self, text): return '<font color="#909090">%s</font>' % text
--- 394,398 ----
                      result = result + format(list[i]) + '<br>\n'
              result = result + '</td>'
!         return '<table width="100%%" summary="list"><tr>%s</tr></table>' % result
  
      def grey(self, text): return '<font color="#909090">%s</font>' % text
***************
*** 786,790 ****
                  args, varargs, varkw, defaults, formatvalue=self.formatvalue)
              if realname == '<lambda>':
!                 decl = '<em>lambda</em>'
                  argspec = argspec[1:-1] # remove parentheses
          else:
--- 786,790 ----
                  args, varargs, varkw, defaults, formatvalue=self.formatvalue)
              if realname == '<lambda>':
!                 title = '<strong>%s</strong> <em>lambda</em> ' % name
                  argspec = argspec[1:-1] # remove parentheses
          else: