summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Lykke Andersen <Jakob@caput.dk>2021-09-25 11:33:37 +0200
committerJakob Lykke Andersen <Jakob@caput.dk>2021-10-02 12:41:40 +0200
commit1cb8c5672047137f2a50bb2ff7d1973b11d6171f (patch)
treef4669bdff2683911bfceef00935f6cd9e605917d
parenta0e986c6b074b8f206faa27d0dc66ea9ed69fb85 (diff)
downloadsphinx-git-1cb8c5672047137f2a50bb2ff7d1973b11d6171f.tar.gz
py nodes, BitOr
-rw-r--r--sphinx/domains/python.py4
-rw-r--r--tests/test_domain_py.py10
2 files changed, 8 insertions, 6 deletions
diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py
index 2dc26a382..e9ca5eff4 100644
--- a/sphinx/domains/python.py
+++ b/sphinx/domains/python.py
@@ -118,7 +118,9 @@ def _parse_annotation(annotation: str, env: BuildEnvironment = None) -> List[Nod
result.extend(unparse(node.right))
return result
elif isinstance(node, ast.BitOr):
- return [nodes.Text(' '), addnodes.desc_sig_punctuation('', '|'), nodes.Text(' ')]
+ return [addnodes.desc_sig_space(),
+ addnodes.desc_sig_punctuation('', '|'),
+ addnodes.desc_sig_space()]
elif isinstance(node, ast.Constant): # type: ignore
if node.value is Ellipsis:
return [addnodes.desc_sig_punctuation('', "...")]
diff --git a/tests/test_domain_py.py b/tests/test_domain_py.py
index b111e5276..d9851ca34 100644
--- a/tests/test_domain_py.py
+++ b/tests/test_domain_py.py
@@ -19,7 +19,7 @@ from sphinx import addnodes
from sphinx.addnodes import (desc, desc_addname, desc_annotation, desc_content, desc_name,
desc_optional, desc_parameter, desc_parameterlist, desc_returns,
desc_sig_name, desc_sig_operator, desc_sig_punctuation,
- desc_signature, pending_xref)
+ desc_signature, desc_sig_space, pending_xref)
from sphinx.domains import IndexEntry
from sphinx.domains.python import (PythonDomain, PythonModuleIndex, _parse_annotation,
_pseudo_parse_arglist, py_sig_re)
@@ -484,9 +484,9 @@ def test_pyfunction_with_union_type_operator(app):
[desc_sig_punctuation, ":"],
" ",
[desc_sig_name, ([pending_xref, "int"],
- " ",
+ desc_sig_space,
[desc_sig_punctuation, "|"],
- " ",
+ desc_sig_space,
[pending_xref, "None"])])])])
@@ -553,9 +553,9 @@ def test_pydata_with_union_type_operator(app):
([desc_name, "version"],
[desc_annotation, (": ",
[pending_xref, "int"],
- " ",
+ desc_sig_space,
[desc_sig_punctuation, "|"],
- " ",
+ desc_sig_space,
[pending_xref, "str"])]))