diff options
| author | Adam Turner <9087854+AA-Turner@users.noreply.github.com> | 2023-04-27 01:02:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-27 01:02:09 +0100 |
| commit | 616ba29f28bd04d7f407a247398b3dbba1da204a (patch) | |
| tree | 09d0709ad7c026eae1de71155308839b303691c7 | |
| parent | 8dd44d1e13c4a85f085a33422a05fbdfe685e8f1 (diff) | |
| download | sphinx-git-616ba29f28bd04d7f407a247398b3dbba1da204a.tar.gz | |
Harmonise references to Sphinx versions (#11361)
| -rw-r--r-- | sphinx/application.py | 5 | ||||
| -rw-r--r-- | sphinx/domains/python.py | 2 | ||||
| -rw-r--r-- | sphinx/ext/intersphinx.py | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/sphinx/application.py b/sphinx/application.py index 99f2b81bd..58e61f7ec 100644 --- a/sphinx/application.py +++ b/sphinx/application.py @@ -1119,8 +1119,9 @@ class Sphinx: .. versionadded:: 0.6 .. versionchanged:: 2.1 - Take a lexer class as an argument. An instance of lexers are - still supported until Sphinx-3.x. + Take a lexer class as an argument. + .. versionchanged:: 4.0 + Removed support for lexer instances as an argument. """ logger.debug('[app] adding lexer: %r', (alias, lexer)) lexer_classes[alias] = lexer diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py index 2fdd79e86..c461cc311 100644 --- a/sphinx/domains/python.py +++ b/sphinx/domains/python.py @@ -1368,7 +1368,7 @@ class PythonDomain(Domain): type, searchmode) if not matches and type == 'attr': - # fallback to meth (for property; Sphinx-2.4.x) + # fallback to meth (for property; Sphinx 2.4.x) # this ensures that `:attr:` role continues to refer to the old property entry # that defined by ``method`` directive in old reST files. matches = self.find_obj(env, modname, clsname, target, 'meth', searchmode) diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py index c07ffc145..2486d29d1 100644 --- a/sphinx/ext/intersphinx.py +++ b/sphinx/ext/intersphinx.py @@ -360,10 +360,10 @@ def _resolve_reference_in_domain(env: BuildEnvironment, ) -> nodes.reference | None: # we adjust the object types for backwards compatibility if domain.name == 'std' and 'cmdoption' in objtypes: - # until Sphinx-1.6, cmdoptions are stored as std:option + # cmdoptions were stored as std:option until Sphinx 1.6 objtypes.append('option') if domain.name == 'py' and 'attribute' in objtypes: - # Since Sphinx-2.1, properties are stored as py:method + # properties are stored as py:method since Sphinx 2.1 objtypes.append('method') # the inventory contains domain:type as objtype |