diff options
| author | Adam Turner <9087854+aa-turner@users.noreply.github.com> | 2022-04-30 19:09:58 +0100 |
|---|---|---|
| committer | Adam Turner <9087854+aa-turner@users.noreply.github.com> | 2022-04-30 19:10:27 +0100 |
| commit | 3f8bf7acb1d9750f7e18f898c74c90e356f310f0 (patch) | |
| tree | 8618029d086d656d2b4dd34417ef53c72d15afda | |
| parent | e7cea699540bbcf31db1c07bc2734bd0485f0d13 (diff) | |
| download | sphinx-git-3f8bf7acb1d9750f7e18f898c74c90e356f310f0.tar.gz | |
Schedule removal for 7.0
| -rw-r--r-- | doc/extdev/deprecated.rst | 2 | ||||
| -rw-r--r-- | sphinx/search/__init__.py | 6 | ||||
| -rw-r--r-- | sphinx/util/jsdump.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/doc/extdev/deprecated.rst b/doc/extdev/deprecated.rst index 35d6eb304..114c927dc 100644 --- a/doc/extdev/deprecated.rst +++ b/doc/extdev/deprecated.rst @@ -24,7 +24,7 @@ The following is a list of deprecated interfaces. * - ``sphinx.util.jsdump`` - 5.0 - - 6.0 + - 7.0 - The standard library ``json`` module. * - :doc:`Setuptools integration </usage/advanced/setuptools>` diff --git a/sphinx/search/__init__.py b/sphinx/search/__init__.py index 5a5622e3a..f8fc294d6 100644 --- a/sphinx/search/__init__.py +++ b/sphinx/search/__init__.py @@ -12,7 +12,7 @@ from docutils import nodes from docutils.nodes import Element, Node from sphinx import addnodes, package_dir -from sphinx.deprecation import RemovedInSphinx60Warning +from sphinx.deprecation import RemovedInSphinx70Warning from sphinx.environment import BuildEnvironment @@ -269,7 +269,7 @@ class IndexBuilder: """Reconstruct from frozen data.""" if format == "jsdump": warnings.warn("format=jsdump is deprecated, use json instead", - RemovedInSphinx60Warning, stacklevel=2) + RemovedInSphinx70Warning, stacklevel=2) format = self.formats["json"] elif isinstance(format, str): format = self.formats[format] @@ -299,7 +299,7 @@ class IndexBuilder: """Dump the frozen index to a stream.""" if format == "jsdump": warnings.warn("format=jsdump is deprecated, use json instead", - RemovedInSphinx60Warning, stacklevel=2) + RemovedInSphinx70Warning, stacklevel=2) format = self.formats["json"] elif isinstance(format, str): format = self.formats[format] diff --git a/sphinx/util/jsdump.py b/sphinx/util/jsdump.py index 008cb6153..77acef9d2 100644 --- a/sphinx/util/jsdump.py +++ b/sphinx/util/jsdump.py @@ -6,7 +6,7 @@ Uses the basestring encode function from simplejson by Bob Ippolito. import re from typing import IO, Any, Dict, List, Match, Union -from sphinx.deprecation import RemovedInSphinx60Warning, deprecated_alias +from sphinx.deprecation import RemovedInSphinx70Warning, deprecated_alias _str_re = re.compile(r'"(\\\\|\\"|[^"])*"') _int_re = re.compile(r'\d+') @@ -204,7 +204,7 @@ deprecated_alias( 'loads': loads, 'load': load, }, - RemovedInSphinx60Warning, + RemovedInSphinx70Warning, { 'dumps': 'json.dumps', 'dump': 'json.dump', |