ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch 'pspacek/arm-zombie-support' into 'main'

Browse Source 
Support ancient build tools for the ARM

See merge request isc-projects/bind9!6598
This commit is contained in:
Petr Špaček
2022-07-21 13:25:51 +00:00
parent fef6111172 8796ad7fe8
commit e918825cd5
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
doc/arm/_ext/iscconf.py
View File

@@ -23,7 +23,7 @@ https://www.sphinx-doc.org/en/master/development/tutorials/recipe.html
from collections import namedtuple
from docutils.parsers.rst import directives
from docutils.parsers.rst import Directive, directives
from docutils import nodes
from sphinx import addnodes
@@ -31,7 +31,6 @@ from sphinx.directives import ObjectDescription
from sphinx.domains import Domain
from sphinx.roles import XRefRole
from sphinx.util import logging
from sphinx.util.docutils import SphinxDirective
from sphinx.util.nodes import make_refnode
import checkgrammar
@@ -61,7 +60,7 @@ def domain_factory(domainname, domainlabel, todolist, grammar):
See StatementListDirective.
"""
class StatementListDirective(SphinxDirective):
class StatementListDirective(Directive):
"""A custom directive to generate list of statements.
It only installs placeholder which is later replaced by
process_statementlist_nodes() callback.
@@ -229,6 +228,7 @@ def domain_factory(domainname, domainlabel, todolist, grammar):
def transform_content(self, contentnode: addnodes.desc_content) -> None:
"""autogenerate content from structured data"""
self.workaround_transform_content = True
if self.isc_short:
contentnode.insert(0, self.isc_short_node)
if self.isc_tags:
@@ -263,6 +263,19 @@ def domain_factory(domainname, domainlabel, todolist, grammar):
if len(warn):
contentnode.insert(0, warn)
def __init__(self, *args, **kwargs):
"""Compability with Sphinx < 3.0.0"""
self.workaround_transform_content = False
super().__init__(*args, **kwargs)
def run(self):
"""Compability with Sphinx < 3.0.0"""
nodelist = super().run()
if not self.workaround_transform_content:
# get access to "contentnode" created inside super.run()
self.transform_content(nodelist[1][-1])
return nodelist
name = domainname
label = domainlabel
@@ -547,7 +560,7 @@ class DictToDocutilsTableBuilder:
row = nodes.row()
for column in self.header:
entry = nodes.entry()
entry += nodes.Text(column.description)
entry += nodes.paragraph(text=column.description)
row += entry
thead.append(row)
@@ -562,7 +575,7 @@ class DictToDocutilsTableBuilder:
entry = nodes.entry()
value = obj[column.dictkey]
if isinstance(value, str):
value = nodes.Text(value)
value = nodes.paragraph(text=value)
else:
value = value.deepcopy()
entry += value