summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2018-09-10 16:08:21 -0400
committerTim Graham <timograham@gmail.com>2018-11-17 18:05:54 -0500
commit882935ef8f10dc6905e4455183908d283bf2ad01 (patch)
tree0ea31947baafefe33767c64569d5f5db6131009c
parentc11a7b4907e58447daab4632a50f5e72d838715e (diff)
downloaddjango-882935ef8f10dc6905e4455183908d283bf2ad01.tar.gz
[1.11.x] Removed usage of deprecated sphinx APIs.
Backport of cc4bb110d31f18d2931fd79d792d3ac09cce19e5 from master.
-rw-r--r--docs/_ext/djangodocs.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py
index c3ca88a610..883c8ab9b9 100644
--- a/docs/_ext/djangodocs.py
+++ b/docs/_ext/djangodocs.py
@@ -10,6 +10,7 @@ from docutils.parsers.rst import Directive, directives
from sphinx import addnodes
from sphinx.builders.html import StandaloneHTMLBuilder
from sphinx.domains.std import Cmdoption
+from sphinx.util import logging
from sphinx.util.console import bold
from sphinx.util.nodes import set_source_info
@@ -18,6 +19,7 @@ try:
except ImportError: # Sphinx 1.6+
from sphinx.writers.html import HTMLTranslator
+logger = logging.getLogger(__name__)
# RE for option descriptions without a '--' prefix
simple_option_desc_re = re.compile(
r'([-_a-zA-Z0-9]+)(\s*.*?)(?=,\s+(?:/|-|--)|$)')
@@ -44,7 +46,7 @@ def setup(app):
rolename="lookup",
indextemplate="pair: %s; field lookup type",
)
- app.add_description_unit(
+ app.add_object_type(
directivename="django-admin",
rolename="djadmin",
indextemplate="pair: %s; django-admin command",
@@ -311,7 +313,7 @@ class DjangoStandaloneHTMLBuilder(StandaloneHTMLBuilder):
def finish(self):
super(DjangoStandaloneHTMLBuilder, self).finish()
- self.info(bold("writing templatebuiltins.js..."))
+ logger.info(bold("writing templatebuiltins.js..."))
xrefs = self.env.domaindata["std"]["objects"]
templatebuiltins = {
"ttags": [