mirror of
https://github.com/python/cpython.git
synced 2025-08-31 14:07:50 +00:00
Revert unintended part of r69948. Pydoc was not supposed to change.
This commit is contained in:
parent
4d9a823cb6
commit
95f285c753
1 changed files with 10 additions and 10 deletions
20
Lib/pydoc.py
20
Lib/pydoc.py
|
@ -390,7 +390,7 @@ class HTMLRepr(Repr):
|
||||||
# needed to make any special characters, so show a raw string.
|
# needed to make any special characters, so show a raw string.
|
||||||
return 'r' + testrepr[0] + self.escape(test) + testrepr[0]
|
return 'r' + testrepr[0] + self.escape(test) + testrepr[0]
|
||||||
return re.sub(r'((\\[\\abfnrtv\'"]|\\[0-9]..|\\x..|\\u....)+)',
|
return re.sub(r'((\\[\\abfnrtv\'"]|\\[0-9]..|\\x..|\\u....)+)',
|
||||||
r'<span class="">\1</span>',
|
r'<font color="#c040c0">\1</font>',
|
||||||
self.escape(testrepr))
|
self.escape(testrepr))
|
||||||
|
|
||||||
repr_str = repr_string
|
repr_str = repr_string
|
||||||
|
@ -417,7 +417,7 @@ class HTMLDoc(Doc):
|
||||||
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>
|
||||||
</head><body>
|
</head><body bgcolor="#f0f0f8">
|
||||||
%s
|
%s
|
||||||
</body></html>''' % (title, contents)
|
</body></html>''' % (title, contents)
|
||||||
|
|
||||||
|
@ -456,7 +456,7 @@ class HTMLDoc(Doc):
|
||||||
|
|
||||||
def bigsection(self, title, *args):
|
def bigsection(self, title, *args):
|
||||||
"""Format a section with a big heading."""
|
"""Format a section with a big heading."""
|
||||||
title = '<span class="bigsection">%s</span>' % title
|
title = '<big><strong>%s</strong></big>' % title
|
||||||
return self.section(title, *args)
|
return self.section(title, *args)
|
||||||
|
|
||||||
def preformat(self, text):
|
def preformat(self, text):
|
||||||
|
@ -477,7 +477,7 @@ class HTMLDoc(Doc):
|
||||||
result = result + '</td>'
|
result = result + '</td>'
|
||||||
return '<table width="100%%" summary="list"><tr>%s</tr></table>' % result
|
return '<table width="100%%" summary="list"><tr>%s</tr></table>' % result
|
||||||
|
|
||||||
def grey(self, text): return '<span class="grey">%s</span>' % text
|
def grey(self, text): return '<font color="#909090">%s</font>' % text
|
||||||
|
|
||||||
def namelink(self, name, *dicts):
|
def namelink(self, name, *dicts):
|
||||||
"""Make a link for an identifier, given name-to-URL mappings."""
|
"""Make a link for an identifier, given name-to-URL mappings."""
|
||||||
|
@ -508,7 +508,7 @@ class HTMLDoc(Doc):
|
||||||
else:
|
else:
|
||||||
url = '%s.html' % name
|
url = '%s.html' % name
|
||||||
if ispackage:
|
if ispackage:
|
||||||
text = '<span class="package">%s</span> (package)' % name
|
text = '<strong>%s</strong> (package)' % name
|
||||||
else:
|
else:
|
||||||
text = name
|
text = name
|
||||||
return '<a href="%s">%s</a>' % (url, text)
|
return '<a href="%s">%s</a>' % (url, text)
|
||||||
|
@ -542,7 +542,7 @@ class HTMLDoc(Doc):
|
||||||
elif text[end:end+1] == '(':
|
elif text[end:end+1] == '(':
|
||||||
results.append(self.namelink(name, methods, funcs, classes))
|
results.append(self.namelink(name, methods, funcs, classes))
|
||||||
elif selfdot:
|
elif selfdot:
|
||||||
results.append('self.<span class="selfdot">%s</span>' % name)
|
results.append('self.<strong>%s</strong>' % name)
|
||||||
else:
|
else:
|
||||||
results.append(self.namelink(name, classes))
|
results.append(self.namelink(name, classes))
|
||||||
here = end
|
here = end
|
||||||
|
@ -557,14 +557,14 @@ class HTMLDoc(Doc):
|
||||||
for entry in tree:
|
for entry in tree:
|
||||||
if type(entry) is type(()):
|
if type(entry) is type(()):
|
||||||
c, bases = entry
|
c, bases = entry
|
||||||
result = result + '<dt class="classlink">'
|
result = result + '<dt><font face="helvetica, arial">'
|
||||||
result = result + self.classlink(c, modname)
|
result = result + self.classlink(c, modname)
|
||||||
if bases and bases != (parent,):
|
if bases and bases != (parent,):
|
||||||
parents = []
|
parents = []
|
||||||
for base in bases:
|
for base in bases:
|
||||||
parents.append(self.classlink(base, modname))
|
parents.append(self.classlink(base, modname))
|
||||||
result = result + '(' + ', '.join(parents) + ')'
|
result = result + '(' + ', '.join(parents) + ')'
|
||||||
result = result + '\n</dt>'
|
result = result + '\n</font></dt>'
|
||||||
elif type(entry) is type([]):
|
elif type(entry) is type([]):
|
||||||
result = result + '<dd>\n%s</dd>\n' % self.formattree(
|
result = result + '<dd>\n%s</dd>\n' % self.formattree(
|
||||||
entry, modname, c)
|
entry, modname, c)
|
||||||
|
@ -581,10 +581,10 @@ class HTMLDoc(Doc):
|
||||||
links = []
|
links = []
|
||||||
for i in range(len(parts)-1):
|
for i in range(len(parts)-1):
|
||||||
links.append(
|
links.append(
|
||||||
'<a href="%s.html" class="links">%s</a>' %
|
'<a href="%s.html"><font color="#ffffff">%s</font></a>' %
|
||||||
('.'.join(parts[:i+1]), parts[i]))
|
('.'.join(parts[:i+1]), parts[i]))
|
||||||
linkedname = '.'.join(links + parts[-1:])
|
linkedname = '.'.join(links + parts[-1:])
|
||||||
head = '<span class="linkedname">%s</span>' % linkedname
|
head = '<big><big><strong>%s</strong></big></big>' % linkedname
|
||||||
try:
|
try:
|
||||||
path = inspect.getabsfile(object)
|
path = inspect.getabsfile(object)
|
||||||
url = path
|
url = path
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue