#14638: pydoc now treats non-str __name__ as None instead of raising
Original patch by Peter Otten.
This commit is contained in:
parent
88ec6209cf
commit
c43125a05c
|
@ -1525,7 +1525,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,
|
||||
renderer=None):
|
||||
|
|
|
@ -282,6 +282,17 @@ class PydocDocTest(unittest.TestCase):
|
|||
result, doc_loc = get_pydoc_text(xml.etree)
|
||||
self.assertEqual(doc_loc, "", "MODULE DOCS incorrectly includes a link")
|
||||
|
||||
def test_non_str_name(self):
|
||||
# issue14638
|
||||
# Treat illegal (non-str) name like no name
|
||||
class A:
|
||||
__name__ = 42
|
||||
class B:
|
||||
pass
|
||||
adoc = pydoc.render_doc(A())
|
||||
bdoc = pydoc.render_doc(B())
|
||||
self.assertEqual(adoc.replace("A", "B"), bdoc)
|
||||
|
||||
def test_not_here(self):
|
||||
missing_module = "test.i_am_not_here"
|
||||
result = str(run_pydoc(missing_module), 'ascii')
|
||||
|
|
|
@ -50,6 +50,9 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #14638: pydoc now treats non-string __name__ values as if they
|
||||
were missing, instead of raising an error.
|
||||
|
||||
- Issue #13684: Fix httplib tunnel issue of infinite loops for certain sites
|
||||
which send EOF without trailing \r\n.
|
||||
|
||||
|
|
Loading…
Reference in New Issue