summaryrefslogtreecommitdiff
path: root/sphinx/domains/python.py
diff options
context:
space:
mode:
Diffstat (limited to 'sphinx/domains/python.py')
-rw-r--r--sphinx/domains/python.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py
index fd43b15b2..87635969b 100644
--- a/sphinx/domains/python.py
+++ b/sphinx/domains/python.py
@@ -5,7 +5,6 @@ import inspect
import re
import sys
import typing
-import warnings
from inspect import Parameter
from typing import Any, Dict, Iterable, Iterator, List, NamedTuple, Optional, Tuple, Type, cast
@@ -18,7 +17,6 @@ from sphinx import addnodes
from sphinx.addnodes import desc_signature, pending_xref, pending_xref_condition
from sphinx.application import Sphinx
from sphinx.builders import Builder
-from sphinx.deprecation import RemovedInSphinx60Warning
from sphinx.directives import ObjectDescription
from sphinx.domains import Domain, Index, IndexEntry, ObjType
from sphinx.environment import BuildEnvironment
@@ -509,14 +507,10 @@ class PyObject(ObjectDescription[Tuple[str, str]]):
sig_prefix = self.get_signature_prefix(sig)
if sig_prefix:
if type(sig_prefix) is str:
- warnings.warn(
+ raise TypeError(
"Python directive method get_signature_prefix()"
- " returning a string is deprecated."
- " It must now return a list of nodes."
- " Return value was '{}'.".format(sig_prefix),
- RemovedInSphinx60Warning)
- signode += addnodes.desc_annotation(sig_prefix, '', # type: ignore
- nodes.Text(sig_prefix)) # type: ignore
+ " must return a list of nodes."
+ f" Return value was '{sig_prefix}'.")
else:
signode += addnodes.desc_annotation(str(sig_prefix), '', *sig_prefix)