diff options
| author | Jean-François B <2589111+jfbu@users.noreply.github.com> | 2022-06-30 14:26:11 +0200 |
|---|---|---|
| committer | Jean-François B <2589111+jfbu@users.noreply.github.com> | 2022-06-30 15:00:16 +0200 |
| commit | 80198e82aa9174802cb1eb30d69ce7fe98e24399 (patch) | |
| tree | aa85c68296bd662543ccbcb17cc55e367e85c3c3 /sphinx/util/docutils.py | |
| parent | ac0fc4b7817389fb8b860d82537f69d9060aabae (diff) | |
| parent | b9736f23484b16feef86208ab00dd947c54446ba (diff) | |
| download | sphinx-git-80198e82aa9174802cb1eb30d69ce7fe98e24399.tar.gz | |
Merge branch '5.x' into master
Resolved merge conflicts:
sphinx/ext/extlinks.py
sphinx/ext/napoleon/docstring.py
(and removed from the latter a now unused import for flake8 F401
compliance)
Diffstat (limited to 'sphinx/util/docutils.py')
| -rw-r--r-- | sphinx/util/docutils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/util/docutils.py b/sphinx/util/docutils.py index e1fd78096..b2944ec28 100644 --- a/sphinx/util/docutils.py +++ b/sphinx/util/docutils.py @@ -550,9 +550,9 @@ class SphinxTranslator(nodes.NodeVisitor): # Node.findall() is a new interface to traverse a doctree since docutils-0.18. -# This applies a patch docutils-0.17 or older to be available Node.findall() +# This applies a patch to docutils up to 0.18 inclusive to provide Node.findall() # method to use it from our codebase. -if docutils.__version_info__ < (0, 18): +if docutils.__version_info__ <= (0, 18): def findall(self, *args, **kwargs): return iter(self.traverse(*args, **kwargs)) |