IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #9095: autodoc: TypeError is raised on processing broken metaclass

Browse Source 
The logging module is crashed when the target object is a broken
metaclass that raises a TypeError on `isinstance()`.

This adds a workaround code to avoid the error.
This commit is contained in:
Takeshi KOMIYA 2021-04-18 14:36:51 +09:00
parent 9105635389
commit da792470b6
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -17,6 +17,7 @@ Features added
-------------- --------------
* #8818: autodoc: Super class having ``Any`` arguments causes nit-picky warning * #8818: autodoc: Super class having ``Any`` arguments causes nit-picky warning
* #9095: autodoc: TypeError is raised on processing broken metaclass
* #9103: LaTeX: imgconverter: conversion runs even if not needed * #9103: LaTeX: imgconverter: conversion runs even if not needed
* #8127: py domain: Ellipsis in info-field-list causes nit-picky warning * #8127: py domain: Ellipsis in info-field-list causes nit-picky warning
* #9023: More CSS classes on domain descriptions, see :ref:`nodes` for details. * #9023: More CSS classes on domain descriptions, see :ref:`nodes` for details.

9
sphinx/ext/autodoc/importer.py
View File

@ -108,7 +108,14 @@ def import_object(modname: str, objpath: List[str], objtype: str = '',
logger.debug('[autodoc] getattr(_, %r)', attrname) logger.debug('[autodoc] getattr(_, %r)', attrname)
mangled_name = mangle(obj, attrname) mangled_name = mangle(obj, attrname)
obj = attrgetter(obj, mangled_name) obj = attrgetter(obj, mangled_name)
logger.debug('[autodoc] => %r', obj)
try:
logger.debug('[autodoc] => %r', obj)
except TypeError:
# fallback of failure on logging for broken object
# refs: https://github.com/sphinx-doc/sphinx/issues/9095
logger.debug('[autodoc] => %r', (obj,))
object_name = attrname object_name = attrname
return [module, parent, object_name, obj] return [module, parent, object_name, obj]
except (AttributeError, ImportError) as exc: except (AttributeError, ImportError) as exc: