mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-25 17:59:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[3.12] gh-102541: Fix Helper.help("mod") for non-existent mod (GH-105934) (#106322)

Browse source 
gh-102541: Fix Helper.help("mod") for non-existent mod (GH-105934)

If the output arg to Helper() is a stream rather than the default None, which means 'page to stdout', the ImportError from pydoc.resolve is currently not caught in pydoc.doc. The same error is caught when output is None.
---------

(cherry picked from commit 0530f4f646)

Co-authored-by: Kirill Podoprigora <kirill.bast9@mail.ru>
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
This commit is contained in:
Miss Islington (bot) 2023-07-01 16:16:14 -07:00 • committed by GitHub
parent 8738c5bcee
commit 730c873efd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/pydoc.py
View file

@ -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."""