mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-07 10:28:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

#14638: pydoc now treats non-str __name__ as None instead of raising

Browse source 
Original patch by Peter Otten.
This commit is contained in:
R David Murray 2012-04-23 13:27:11 -04:00
parent 4c20c4e198
commit c313b1d9b0
3 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/pydoc.py
View file

@ -1498,7 +1498,8 @@ def resolve(thing, forceload=0):
raise ImportError, 'no Python documentation found for %r' % thing
return object, thing
else:
return thing, getattr(thing, '__name__', None)
name = getattr(thing, '__name__', None)
return thing, name if isinstance(name, str) else None
def render_doc(thing, title='Python Library Documentation: %s', forceload=0):
"""Render text documentation, given an object or a path to an object."""