diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-12-07 04:03:30 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-12-07 04:03:30 +0000 |
| commit | 76cf4db4947254c65df60bfa0df85f49b6703cb2 (patch) | |
| tree | f064d276fe3d3616d60ff8a9252f20e95e30d922 | |
| parent | dc8673585931cb2f129e354e886b5809d4b3a9b4 (diff) | |
[1.0.X] Fixed #9645 -- Work around a backwards-incompatibility in Sphinx so that
various combinations of released docutils and sphinx versions all work
together. Thanks, Ramiro Morales.
Backport of r9586 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9587 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | docs/_ext/djangodocs.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py index 5640016502..bda7d3e4ce 100644 --- a/docs/_ext/djangodocs.py +++ b/docs/_ext/djangodocs.py @@ -130,21 +130,21 @@ class DjangoHTMLTranslator(sphinx.htmlwriter.SmartyPantsHTMLTranslator): # Give each section a unique ID -- nice for custom CSS hooks # This is different on docutils 0.5 vs. 0.4... - - # The docutils 0.4 override. - if hasattr(sphinx.htmlwriter.SmartyPantsHTMLTranslator, 'start_tag_with_title'): + + if hasattr(sphinx.htmlwriter.SmartyPantsHTMLTranslator, 'start_tag_with_title') and sphinx.__version__ == '0.4.2': def start_tag_with_title(self, node, tagname, **atts): node = { 'classes': node.get('classes', []), 'ids': ['s-%s' % i for i in node.get('ids', [])] } return self.starttag(node, tagname, **atts) - - # The docutils 0.5 override. - else: + + else: def visit_section(self, node): old_ids = node.get('ids', []) node['ids'] = ['s-' + i for i in old_ids] + if sphinx.__version__ != '0.4.2': + node['ids'].extend(old_ids) sphinx.htmlwriter.SmartyPantsHTMLTranslator.visit_section(self, node) node['ids'] = old_ids |