bpo-35293: Remove RemovedInSphinx40Warning

Doc/tools/extensions/pyspecific.py

@@ -31,7 +31,16 @@
 from sphinx.util.nodes import split_explicit_title
 from sphinx.writers.text import TextWriter, TextTranslator
 from sphinx.writers.latex import LaTeXTranslator
-from sphinx.domains.python import PyModulelevel, PyClassmember
+
+try:
+ from sphinx.domains.python import PyMethod
+except ImportError:
+ from sphinx.domains.python import PyClassmember as PyMethod
+
+try:
+ from sphinx.domains.python import PyFunction
+except ImportError:
+ from sphinx.domains.python import PyModulelevel as PyFunction
 
 # Support for checking for suspicious markup
 
@@ -271,17 +280,18 @@ def needs_arglist(self):
  return False
 
 
-class PyDecoratorFunction(PyDecoratorMixin, PyModulelevel):
+class PyDecoratorFunction(PyDecoratorMixin, PyFunction):
  def run(self):
  # a decorator function is a function after all
  self.name = 'py:function'
- return PyModulelevel.run(self)
+ return PyFunction.run(self)
 
 
-class PyDecoratorMethod(PyDecoratorMixin, PyClassmember):
+# TODO: Use sphinx.domains.python.PyDecoratorMethod when possible
+class PyDecoratorMethod(PyDecoratorMixin, PyMethod):
  def run(self):
  self.name = 'py:method'
- return PyClassmember.run(self)
+ return PyMethod.run(self)
 
 
 class PyCoroutineMixin(object):
@@ -298,31 +308,31 @@ def handle_signature(self, sig, signode):
  return ret
 
 
-class PyCoroutineFunction(PyCoroutineMixin, PyModulelevel):
+class PyCoroutineFunction(PyCoroutineMixin, PyFunction):
  def run(self):
  self.name = 'py:function'
- return PyModulelevel.run(self)
+ return PyFunction.run(self)
 
 
-class PyCoroutineMethod(PyCoroutineMixin, PyClassmember):
+class PyCoroutineMethod(PyCoroutineMixin, PyMethod):
  def run(self):
  self.name = 'py:method'
- return PyClassmember.run(self)
+ return PyMethod.run(self)
 
 
-class PyAwaitableFunction(PyAwaitableMixin, PyClassmember):
+class PyAwaitableFunction(PyAwaitableMixin, PyFunction):
  def run(self):
  self.name = 'py:function'
- return PyClassmember.run(self)
+ return PyFunction.run(self)
 
 
-class PyAwaitableMethod(PyAwaitableMixin, PyClassmember):
+class PyAwaitableMethod(PyAwaitableMixin, PyMethod):
  def run(self):
  self.name = 'py:method'
- return PyClassmember.run(self)
+ return PyMethod.run(self)
 
 
-class PyAbstractMethod(PyClassmember):
+class PyAbstractMethod(PyMethod):
 
  def handle_signature(self, sig, signode):
  ret = super(PyAbstractMethod, self).handle_signature(sig, signode)
@@ -332,7 +342,7 @@ def handle_signature(self, sig, signode):
 
  def run(self):
  self.name = 'py:method'
- return PyClassmember.run(self)
+ return PyMethod.run(self)
 
 
 # Support for documenting version of removal in deprecations

Misc/NEWS.d/next/Documentation/2020-09-12-17-37-13.bpo-35293._cOwPD.rst

@@ -0,0 +1 @@
+Remove RemovedInSphinx40Warning when building sphinx. Patch by Dong-hee Na.