From 95f285c7536fb77f485b49f9585f3860566dd462 Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Tue, 24 Feb 2009 23:41:47 +0000 Subject: Revert unintended part of r69948. Pydoc was not supposed to change. --- Lib/pydoc.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Lib/pydoc.py b/Lib/pydoc.py index be2a73e..2aea8c0 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -390,7 +390,7 @@ class HTMLRepr(Repr): # needed to make any special characters, so show a raw string. return 'r' + testrepr[0] + self.escape(test) + testrepr[0] return re.sub(r'((\\[\\abfnrtv\'"]|\\[0-9]..|\\x..|\\u....)+)', - r'\1', + r'\1', self.escape(testrepr)) repr_str = repr_string @@ -417,7 +417,7 @@ class HTMLDoc(Doc): return ''' Python: %s - + %s ''' % (title, contents) @@ -456,7 +456,7 @@ class HTMLDoc(Doc): def bigsection(self, title, *args): """Format a section with a big heading.""" - title = '%s' % title + title = '%s' % title return self.section(title, *args) def preformat(self, text): @@ -477,7 +477,7 @@ class HTMLDoc(Doc): result = result + '' return '%s
' % result - def grey(self, text): return '%s' % text + def grey(self, text): return '%s' % text def namelink(self, name, *dicts): """Make a link for an identifier, given name-to-URL mappings.""" @@ -508,7 +508,7 @@ class HTMLDoc(Doc): else: url = '%s.html' % name if ispackage: - text = '%s (package)' % name + text = '%s (package)' % name else: text = name return '%s' % (url, text) @@ -542,7 +542,7 @@ class HTMLDoc(Doc): elif text[end:end+1] == '(': results.append(self.namelink(name, methods, funcs, classes)) elif selfdot: - results.append('self.%s' % name) + results.append('self.%s' % name) else: results.append(self.namelink(name, classes)) here = end @@ -557,14 +557,14 @@ class HTMLDoc(Doc): for entry in tree: if type(entry) is type(()): c, bases = entry - result = result + '
' + result = result + '
' result = result + self.classlink(c, modname) if bases and bases != (parent,): parents = [] for base in bases: parents.append(self.classlink(base, modname)) result = result + '(' + ', '.join(parents) + ')' - result = result + '\n
' + result = result + '\n' elif type(entry) is type([]): result = result + '
\n%s
\n' % self.formattree( entry, modname, c) @@ -581,10 +581,10 @@ class HTMLDoc(Doc): links = [] for i in range(len(parts)-1): links.append( - '%s' % + '%s' % ('.'.join(parts[:i+1]), parts[i])) linkedname = '.'.join(links + parts[-1:]) - head = '%s' % linkedname + head = '%s' % linkedname try: path = inspect.getabsfile(object) url = path -- cgit v0.12