[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 2/9] docs/qapidoc: factor out do_parse()
From: |
John Snow |
Subject: |
[PATCH v2 2/9] docs/qapidoc: factor out do_parse() |
Date: |
Tue, 16 Jul 2024 22:13:04 -0400 |
Factor out the compatibility parser helper into a base class, so it can
be shared by other directives.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
docs/sphinx/qapidoc.py | 32 +++++++++++++++++++-------------
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/docs/sphinx/qapidoc.py b/docs/sphinx/qapidoc.py
index 62b39833ca0..b3be82998a8 100644
--- a/docs/sphinx/qapidoc.py
+++ b/docs/sphinx/qapidoc.py
@@ -481,7 +481,25 @@ def visit_module(self, name):
super().visit_module(name)
-class QAPIDocDirective(Directive):
+class NestedDirective(Directive):
+ def run(self):
+ raise NotImplementedError
+
+ def do_parse(self, rstlist, node):
+ """
+ Parse rST source lines and add them to the specified node
+
+ Take the list of rST source lines rstlist, parse them as
+ rST, and add the resulting docutils nodes as children of node.
+ The nodes are parsed in a way that allows them to include
+ subheadings (titles) without confusing the rendering of
+ anything else.
+ """
+ with switch_source_input(self.state, rstlist):
+ nested_parse_with_titles(self.state, rstlist, node)
+
+
+class QAPIDocDirective(NestedDirective):
"""Extract documentation from the specified QAPI .json file"""
required_argument = 1
@@ -519,18 +537,6 @@ def run(self):
# so they are displayed nicely to the user
raise ExtensionError(str(err)) from err
- def do_parse(self, rstlist, node):
- """Parse rST source lines and add them to the specified node
-
- Take the list of rST source lines rstlist, parse them as
- rST, and add the resulting docutils nodes as children of node.
- The nodes are parsed in a way that allows them to include
- subheadings (titles) without confusing the rendering of
- anything else.
- """
- with switch_source_input(self.state, rstlist):
- nested_parse_with_titles(self.state, rstlist, node)
-
def setup(app):
"""Register qapi-doc directive with Sphinx"""
--
2.45.0
- [PATCH v2 0/9] qapi: convert example sections to qmp-example rST directives, John Snow, 2024/07/16
- [PATCH v2 1/9] [DO-NOT-MERGE]: Add some ad-hoc linting helpers., John Snow, 2024/07/16
- [PATCH v2 3/9] docs/qapidoc: create qmp-example directive, John Snow, 2024/07/16
- [PATCH v2 4/9] docs/qapidoc: add QMP highlighting to annotated qmp-example blocks, John Snow, 2024/07/16
- [PATCH v2 2/9] docs/qapidoc: factor out do_parse(),
John Snow <=
- [PATCH v2 5/9] docs/sphinx: add CSS styling for qmp-example directive, John Snow, 2024/07/16
- [PATCH v2 6/9] qapi: convert "Example" sections without titles, John Snow, 2024/07/16
- [PATCH v2 7/9] qapi: convert "Example" sections with titles, John Snow, 2024/07/16
- [PATCH v2 8/9] qapi: convert "Example" sections with longer prose, John Snow, 2024/07/16
- [PATCH v2 9/9] qapi: remove "Example" doc section, John Snow, 2024/07/16
- Re: [PATCH v2 0/9] qapi: convert example sections to qmp-example rST directives, Markus Armbruster, 2024/07/17