Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[1.11.x] Removed usage of deprecated sphinx APIs.

Browse Source 
Backport of cc4bb110d31f18d2931fd79d792d3ac09cce19e5 from master.
This commit is contained in:
Tim Graham 2018-09-10 16:08:21 -04:00
parent c11a7b4907
commit 882935ef8f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/_ext/djangodocs.py
View File

@ -10,6 +10,7 @@ from docutils.parsers.rst import Directive, directives
from sphinx import addnodes from sphinx import addnodes
from sphinx.builders.html import StandaloneHTMLBuilder from sphinx.builders.html import StandaloneHTMLBuilder
from sphinx.domains.std import Cmdoption from sphinx.domains.std import Cmdoption
from sphinx.util import logging
from sphinx.util.console import bold from sphinx.util.console import bold
from sphinx.util.nodes import set_source_info from sphinx.util.nodes import set_source_info
@ -18,6 +19,7 @@ try:
except ImportError: # Sphinx 1.6+ except ImportError: # Sphinx 1.6+
from sphinx.writers.html import HTMLTranslator from sphinx.writers.html import HTMLTranslator
logger = logging.getLogger(__name__)
# RE for option descriptions without a '--' prefix # RE for option descriptions without a '--' prefix
simple_option_desc_re = re.compile( simple_option_desc_re = re.compile(
r'([-_a-zA-Z0-9]+)(\s*.*?)(?=,\s+(?:/|-|--)|$)') r'([-_a-zA-Z0-9]+)(\s*.*?)(?=,\s+(?:/|-|--)|$)')
@ -44,7 +46,7 @@ def setup(app):
rolename="lookup", rolename="lookup",
indextemplate="pair: %s; field lookup type", indextemplate="pair: %s; field lookup type",
) )
app.add_description_unit( app.add_object_type(
directivename="django-admin", directivename="django-admin",
rolename="djadmin", rolename="djadmin",
indextemplate="pair: %s; django-admin command", indextemplate="pair: %s; django-admin command",
@ -311,7 +313,7 @@ class DjangoStandaloneHTMLBuilder(StandaloneHTMLBuilder):
def finish(self): def finish(self):
super(DjangoStandaloneHTMLBuilder, self).finish() super(DjangoStandaloneHTMLBuilder, self).finish()
self.info(bold("writing templatebuiltins.js...")) logger.info(bold("writing templatebuiltins.js..."))
xrefs = self.env.domaindata["std"]["objects"] xrefs = self.env.domaindata["std"]["objects"]
templatebuiltins = { templatebuiltins = {
"ttags": [ "ttags": [