diff options
| author | Tim Graham <timograham@gmail.com> | 2018-09-10 16:08:21 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-09-11 09:27:16 -0400 |
| commit | 780190f6d95cfb498e6a3969ffc04b14d2c8750f (patch) | |
| tree | 2a2ef1a95b9846b330e540164e90594433c7f953 | |
| parent | 24b3aa0275717029f658906c6fbc2e8fec28949e (diff) | |
| download | django-780190f6d95cfb498e6a3969ffc04b14d2c8750f.tar.gz | |
[2.1.x] Removed usage of deprecated sphinx APIs.
Backport of cc4bb110d31f18d2931fd79d792d3ac09cce19e5 from master
| -rw-r--r-- | docs/_ext/djangodocs.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py index 30d3741b89..c4ee09b5cd 100644 --- a/docs/_ext/djangodocs.py +++ b/docs/_ext/djangodocs.py @@ -12,9 +12,11 @@ from sphinx import addnodes from sphinx.builders.html import StandaloneHTMLBuilder from sphinx.directives import CodeBlock from sphinx.domains.std import Cmdoption +from sphinx.util import logging from sphinx.util.console import bold 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+(?:/|-|--)|$)') @@ -41,7 +43,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", @@ -179,7 +181,7 @@ class DjangoStandaloneHTMLBuilder(StandaloneHTMLBuilder): def finish(self): super().finish() - self.info(bold("writing templatebuiltins.js...")) + logger.info(bold("writing templatebuiltins.js...")) xrefs = self.env.domaindata["std"]["objects"] templatebuiltins = { "ttags": [ |