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

Merge pull request #8896 from tk0miya/8883_AttributeError_assigning_annotations

Browse Source 
Fix #8883: autodoc: AttributeError on assigning __annotations__
This commit is contained in:
Takeshi KOMIYA 2021-02-16 20:38:12 +09:00 committed by GitHub
commit e2bef2d1d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -16,6 +16,8 @@ Features added
Bugs fixed Bugs fixed
---------- ----------
* #8883: autodoc: AttributeError is raised on assigning __annotations__ on
read-only class
* #8884: html: minified js stemmers not included in the distributed package * #8884: html: minified js stemmers not included in the distributed package
* #8885: html: AttributeError is raised if CSS/JS files are installed via * #8885: html: AttributeError is raised if CSS/JS files are installed via
:confval:`html_context` :confval:`html_context`

6
sphinx/ext/autodoc/__init__.py
View File

@ -1394,7 +1394,7 @@ class FunctionDocumenter(DocstringSignatureMixin, ModuleLevelDocumenter): # typ
params[0] = params[0].replace(annotation=typ) params[0] = params[0].replace(annotation=typ)
try: try:
func.__signature__ = sig.replace(parameters=params) # type: ignore func.__signature__ = sig.replace(parameters=params) # type: ignore
except TypeError: except (AttributeError, TypeError):
# failed to update signature (ex. built-in or extension types) # failed to update signature (ex. built-in or extension types)
return return
@ -2177,7 +2177,7 @@ class MethodDocumenter(DocstringSignatureMixin, ClassLevelDocumenter): # type:
params[1] = params[1].replace(annotation=typ) params[1] = params[1].replace(annotation=typ)
try: try:
func.__signature__ = sig.replace(parameters=params) # type: ignore func.__signature__ = sig.replace(parameters=params) # type: ignore
except TypeError: except (AttributeError, TypeError):
# failed to update signature (ex. built-in or extension types) # failed to update signature (ex. built-in or extension types)
return return
@ -2443,7 +2443,7 @@ class AttributeDocumenter(GenericAliasMixin, NewTypeMixin, SlotsMixin, # type:
annotations[attrname] = annotation annotations[attrname] = annotation
except (AttributeError, PycodeError): except (AttributeError, PycodeError):
pass pass
except TypeError: except (AttributeError, TypeError):
# Failed to set __annotations__ (built-in, extensions, etc.) # Failed to set __annotations__ (built-in, extensions, etc.)
pass pass