Skip to content

Commit

Permalink
Merge branch '4.1.x' into 9456_revert_9129
Browse files Browse the repository at this point in the history
  • Loading branch information
tk0miya authored Jul 25, 2021
2 parents ef53dec + 5d8f925 commit df562b4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Bugs fixed
with the HEAD of 3.10
* #9490: autodoc: Some objects under ``typing`` module are not displayed well
with the HEAD of 3.10
* #9436, #9471: autodoc: crashed if ``autodoc_class_signature = "separated"``
* #9456: html search: html_copy_source can't control the search summaries
* #9435: linkcheck: Failed to check anchors in github.com

Expand Down
7 changes: 6 additions & 1 deletion sphinx/ext/autodoc/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,9 @@ def process(app: Sphinx, what_: str, name: str, obj: Any, options: Any, lines: L
# But we define this class here to keep compatibility (see #4538)
class Options(dict):
"""A dict/attribute hybrid that returns None on nonexisting keys."""
def copy(self) -> "Options":
return Options(super().copy())

def __getattr__(self, name: str) -> Any:
try:
return self[name.replace('_', '-')]
Expand Down Expand Up @@ -1445,9 +1448,11 @@ def __init__(self, *args: Any) -> None:
super().__init__(*args)

if self.config.autodoc_class_signature == 'separated':
self.options = self.options.copy()

# show __init__() method
if self.options.special_members is None:
self.options['special-members'] = {'__new__', '__init__'}
self.options['special-members'] = ['__new__', '__init__']
else:
self.options.special_members.append('__new__')
self.options.special_members.append('__init__')
Expand Down

0 comments on commit df562b4

Please sign in to comment.