python
diff --git a/‎Lib/pydoc.py‎
Lines changed: 5 additions & 1 deletion b/‎Lib/pydoc.py‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎Lib/test/test_pydoc.py‎
Lines changed: 7 additions & 0 deletions b/‎Lib/test/test_pydoc.py‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎Misc/NEWS.d/next/Library/2023-07-01-16-40-54.gh-issue-102541.C1ahtk.rst‎
Lines changed: 1 addition & 0 deletions b/‎Misc/NEWS.d/next/Library/2023-07-01-16-40-54.gh-issue-102541.C1ahtk.rst‎
Lines changed: 1 addition & 0 deletions
@@ -1790,7 +1790,11 @@ def doc(thing, title='Python Library Documentation: %s', forceload=0,
                 raise
             print(exc)
     else:
-        output.write(render_doc(thing, title, forceload, plaintext))
+        try:
+            s = render_doc(thing, title, forceload, plaintext)
+        except ImportError as exc:
+            s = str(exc)
+        output.write(s)
 
 def writedoc(thing, forceload=0):
     """Write HTML documentation to a file in the current directory."""
 
@@ -631,6 +631,13 @@ def test_builtin_on_metaclasses(self):
         # Testing that the subclasses section does not appear
         self.assertNotIn('Built-in subclasses', text)
 
+    def test_fail_help_output_redirect(self):
+        with StringIO() as buf:
+            helper = pydoc.Helper(output=buf)
+            helper.help("abd")
+            expected = missing_pattern % "abd"
+            self.assertEqual(expected, buf.getvalue().strip().replace('\n', os.linesep))
+
     @unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(),
                      'trace function introduces __locals__ unexpectedly')
     @requires_docstrings
 
@@ -0,0 +1 @@
+Make pydoc.doc catch bad module ImportError when output stream is not None.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Make pydoc.doc catch bad module ImportError when output stream is not None.`