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

Ensure changeset.descname is a string when not None (#13150)

Browse Source
This commit is contained in:
Adam Turner 2024-11-22 14:54:50 +00:00 committed by GitHub
parent 697da6e4bc
commit ddd5aede23
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sphinx/builders/changes.py
View File

@ -61,10 +61,7 @@ class ChangesBuilder(Builder):
return return
logger.info(bold(__('writing summary file...'))) logger.info(bold(__('writing summary file...')))
for changeset in changesets: for changeset in changesets:
if isinstance(changeset.descname, tuple): descname = changeset.descname
descname = changeset.descname[0]
else:
descname = changeset.descname
ttext = self.typemap[changeset.type] ttext = self.typemap[changeset.type]
context = changeset.content.replace('\n', ' ') context = changeset.content.replace('\n', ' ')
if descname and changeset.docname.startswith('c-api'): if descname and changeset.docname.startswith('c-api'):

6
sphinx/directives/__init__.py
View File

@ -282,7 +282,11 @@ class ObjectDescription(SphinxDirective, Generic[ObjDescT]):
if self.names: if self.names:
# needed for association of version{added,changed} directives # needed for association of version{added,changed} directives
self.env.temp_data['object'] = self.names[0] object_name: ObjDescT = self.names[0]
if isinstance(object_name, tuple):
self.env.temp_data['object'] = str(object_name[0])
else:
self.env.temp_data['object'] = str(object_name)
self.before_content() self.before_content()
content_children = self.parse_content_to_nodes(allow_section_headings=True) content_children = self.parse_content_to_nodes(allow_section_headings=True)
content_node = addnodes.desc_content('', *content_children) content_node = addnodes.desc_content('', *content_children)