Skip to content

C
cpython
Commit 59ed448b authored by Tim Peters's avatar Tim Peters
Browse files
Options

SF patch #474485: pydoc generates some bad html, from Rich Salz.

parent a6ca4f40
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
Lib/pydoc.py
View file @ 59ed448b
...@@ -331,7 +331,7 @@ class HTMLDoc(Doc): ...@@ -331,7 +331,7 @@ class HTMLDoc(Doc):
def page(self, title, contents): def page(self, title, contents):
"""Format an HTML page.""" """Format an HTML page."""
return ''' return '''
<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"> <!doctype html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html><head><title>Python: %s</title> <html><head><title>Python: %s</title>
<style type="text/css"><!-- <style type="text/css"><!--
TT { font-family: lucidatypewriter, lucida console, courier } TT { font-family: lucidatypewriter, lucida console, courier }
...@@ -342,7 +342,7 @@ TT { font-family: lucidatypewriter, lucida console, courier } ...@@ -342,7 +342,7 @@ TT { font-family: lucidatypewriter, lucida console, courier }
def heading(self, title, fgcol, bgcol, extras=''): def heading(self, title, fgcol, bgcol, extras=''):
"""Format a page heading.""" """Format a page heading."""
return ''' return '''
<table width="100%%" cellspacing=0 cellpadding=2 border=0> <table width="100%%" cellspacing=0 cellpadding=2 border=0 summary="heading">
<tr bgcolor="%s"> <tr bgcolor="%s">
<td valign=bottom>&nbsp;<br> <td valign=bottom>&nbsp;<br>
<font color="%s" face="helvetica, arial">&nbsp;<br>%s</font></td <font color="%s" face="helvetica, arial">&nbsp;<br>%s</font></td
...@@ -356,7 +356,7 @@ TT { font-family: lucidatypewriter, lucida console, courier } ...@@ -356,7 +356,7 @@ TT { font-family: lucidatypewriter, lucida console, courier }
if marginalia is None: if marginalia is None:
marginalia = '<tt>' + '&nbsp;' * width + '</tt>' marginalia = '<tt>' + '&nbsp;' * width + '</tt>'
result = ''' result = '''
<p><table width="100%%" cellspacing=0 cellpadding=2 border=0> <table width="100%%" cellspacing=0 cellpadding=2 border=0 summary="section">
<tr bgcolor="%s"> <tr bgcolor="%s">
<td colspan=3 valign=bottom>&nbsp;<br> <td colspan=3 valign=bottom>&nbsp;<br>
<font color="%s" face="helvetica, arial">%s</font></td></tr> <font color="%s" face="helvetica, arial">%s</font></td></tr>
...@@ -393,7 +393,7 @@ TT { font-family: lucidatypewriter, lucida console, courier } ...@@ -393,7 +393,7 @@ TT { font-family: lucidatypewriter, lucida console, courier }
if i < len(list): if i < len(list):
result = result + format(list[i]) + '<br>\n' result = result + format(list[i]) + '<br>\n'
result = result + '</td>' result = result + '</td>'
return '<table width="100%%"><tr>%s</tr></table>' % result return '<table width="100%%" summary="list"><tr>%s</tr></table>' % result
def grey(self, text): return '<font color="#909090">%s</font>' % text def grey(self, text): return '<font color="#909090">%s</font>' % text
...@@ -785,7 +785,7 @@ TT { font-family: lucidatypewriter, lucida console, courier } ...@@ -785,7 +785,7 @@ TT { font-family: lucidatypewriter, lucida console, courier }
argspec = inspect.formatargspec( argspec = inspect.formatargspec(
args, varargs, varkw, defaults, formatvalue=self.formatvalue) args, varargs, varkw, defaults, formatvalue=self.formatvalue)
if realname == '<lambda>': if realname == '<lambda>':
decl = '<em>lambda</em>' title = '<strong>%s</strong> <em>lambda</em> ' % name
argspec = argspec[1:-1] # remove parentheses argspec = argspec[1:-1] # remove parentheses
else: else:
argspec = '(...)' argspec = '(...)'
......
Misc/ACKS
View file @ 59ed448b
...@@ -408,6 +408,7 @@ Kalle Svensson ...@@ -408,6 +408,7 @@ Kalle Svensson
Hajime Saitou Hajime Saitou
RajGopal Srinivasan RajGopal Srinivasan
Jim St. Pierre Jim St. Pierre
Rich Salz
Quentin Stafford-Fraser Quentin Stafford-Fraser
Frank Stajano Frank Stajano
Richard Stoakley Richard Stoakley
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7