Update patch
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python312?expand=0&rev=97
This commit is contained in:
parent
c062335ad2
commit
bae099bfd7
@ -3,10 +3,10 @@
|
|||||||
Doc/tools/check-warnings.py | 3 +
|
Doc/tools/check-warnings.py | 3 +
|
||||||
Doc/tools/extensions/audit_events.py | 54 ++++++++++++++++----------------
|
Doc/tools/extensions/audit_events.py | 54 ++++++++++++++++----------------
|
||||||
Doc/tools/extensions/availability.py | 15 ++++----
|
Doc/tools/extensions/availability.py | 15 ++++----
|
||||||
Doc/tools/extensions/c_annotations.py | 41 ++++++++++++++----------
|
Doc/tools/extensions/c_annotations.py | 45 ++++++++++++++++----------
|
||||||
Doc/tools/extensions/glossary_search.py | 10 +----
|
Doc/tools/extensions/glossary_search.py | 10 +----
|
||||||
Doc/tools/extensions/patchlevel.py | 9 ++---
|
Doc/tools/extensions/patchlevel.py | 9 ++---
|
||||||
7 files changed, 84 insertions(+), 65 deletions(-)
|
7 files changed, 87 insertions(+), 66 deletions(-)
|
||||||
|
|
||||||
--- a/Doc/conf.py
|
--- a/Doc/conf.py
|
||||||
+++ b/Doc/conf.py
|
+++ b/Doc/conf.py
|
||||||
@ -266,7 +266,7 @@
|
|||||||
return {
|
return {
|
||||||
--- a/Doc/tools/extensions/c_annotations.py
|
--- a/Doc/tools/extensions/c_annotations.py
|
||||||
+++ b/Doc/tools/extensions/c_annotations.py
|
+++ b/Doc/tools/extensions/c_annotations.py
|
||||||
@@ -9,12 +9,10 @@ Configuration:
|
@@ -9,22 +9,18 @@ Configuration:
|
||||||
* Set ``stable_abi_file`` to the path to stable ABI list.
|
* Set ``stable_abi_file`` to the path to stable ABI list.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@ -280,7 +280,8 @@
|
|||||||
|
|
||||||
from docutils import nodes
|
from docutils import nodes
|
||||||
from docutils.statemachine import StringList
|
from docutils.statemachine import StringList
|
||||||
@@ -22,9 +20,7 @@ from sphinx import addnodes
|
-from sphinx import addnodes
|
||||||
|
+from sphinx import addnodes, version_info
|
||||||
from sphinx.locale import _ as sphinx_gettext
|
from sphinx.locale import _ as sphinx_gettext
|
||||||
from sphinx.util.docutils import SphinxDirective
|
from sphinx.util.docutils import SphinxDirective
|
||||||
|
|
||||||
@ -369,7 +370,7 @@
|
|||||||
state = self.env.domaindata["c_annotations"]
|
state = self.env.domaindata["c_annotations"]
|
||||||
content = [
|
content = [
|
||||||
f"* :c:{record.role}:`{record.name}`"
|
f"* :c:{record.role}:`{record.name}`"
|
||||||
@@ -281,13 +280,21 @@ def init_annotations(app: Sphinx) -> Non
|
@@ -281,13 +280,23 @@ def init_annotations(app: Sphinx) -> Non
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -381,6 +382,8 @@
|
|||||||
app.connect("builder-inited", init_annotations)
|
app.connect("builder-inited", init_annotations)
|
||||||
app.connect("doctree-read", add_annotations)
|
app.connect("doctree-read", add_annotations)
|
||||||
|
|
||||||
|
+ if version_info[:2] < (7, 2):
|
||||||
|
+ from docutils.parsers.rst import directives
|
||||||
+ from sphinx.domains.c import CObject
|
+ from sphinx.domains.c import CObject
|
||||||
+
|
+
|
||||||
+ # monkey-patch C object...
|
+ # monkey-patch C object...
|
||||||
|
Loading…
x
Reference in New Issue
Block a user