bpo-940286: Fix pydoc to show cross refs correctly (GH-8390)

miss-islington · berkerpeksag · web-flow · commit e9e6495eedd7 · 2018-07-22T23:51:28.000-07:00
(cherry picked from commit d04f46c) Co-authored-by: Berker Peksag <berker.peksag@gmail.com>
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
@@ -1992,14 +1992,15 @@ def showtopic(self, topic, more_xrefs=''):
         except KeyError:
             self.output.write('no documentation found for %s\n' % repr(topic))
             return
-        pager(doc.strip() + '\n')
+        doc = doc.strip() + '\n'
         if more_xrefs:
             xrefs = (xrefs or '') + ' ' + more_xrefs
         if xrefs:
             import textwrap
             text = 'Related help topics: ' + ', '.join(xrefs.split()) + '\n'
             wrapped_text = textwrap.wrap(text, 72)
-            self.output.write('\n%s\n' % ''.join(wrapped_text))
+            doc += '\n%s\n' % '\n'.join(wrapped_text)
+        pager(doc)
 
     def _gettopic(self, topic, more_xrefs=''):
         """Return unbuffered tuple of (topic, xrefs).
diff --git a/Misc/NEWS.d/next/Library/2018-07-22-07-59-32.bpo-940286.NZTzyc.rst b/Misc/NEWS.d/next/Library/2018-07-22-07-59-32.bpo-940286.NZTzyc.rst
@@ -0,0 +1,2 @@
+pydoc's ``Helper.showtopic()`` method now prints the cross references of a
+topic correctly.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+pydoc's ``Helper.showtopic()`` method now prints the cross references of a
	`2`	`+topic correctly.`