From b78e5dec18c79ab8a1910478ab61a65cd691078a Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Wed, 17 May 2017 13:09:12 +0300 Subject: [1.11.x] Fixed docs build with Sphinx 1.6. Backport of f370bfb10878918eae8db9985e0856949fa65d3a from master --- docs/_ext/djangodocs.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'docs/_ext') diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py index a5d545f46b..a196d63dd1 100644 --- a/docs/_ext/djangodocs.py +++ b/docs/_ext/djangodocs.py @@ -13,7 +13,10 @@ from sphinx.domains.std import Cmdoption from sphinx.util.compat import Directive from sphinx.util.console import bold from sphinx.util.nodes import set_source_info -from sphinx.writers.html import SmartyPantsHTMLTranslator +try: + from sphinx.writers.html import SmartyPantsHTMLTranslator as HTMLTranslator +except ImportError: # Sphinx 1.6+ + from sphinx.writers.html import HTMLTranslator # RE for option descriptions without a '--' prefix simple_option_desc_re = re.compile( @@ -226,7 +229,7 @@ class VersionDirective(Directive): return ret -class DjangoHTMLTranslator(SmartyPantsHTMLTranslator): +class DjangoHTMLTranslator(HTMLTranslator): """ Django-specific reST to HTML tweaks. """ @@ -287,7 +290,7 @@ class DjangoHTMLTranslator(SmartyPantsHTMLTranslator): old_ids = node.get('ids', []) node['ids'] = ['s-' + i for i in old_ids] node['ids'].extend(old_ids) - SmartyPantsHTMLTranslator.visit_section(self, node) + HTMLTranslator.visit_section(self, node) node['ids'] = old_ids -- cgit v1.3