From b95c06d423a019151b44dde27bcb7ea1617b83a6 Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Mon, 10 Oct 2011 00:23:47 +0000 Subject: [PATCH] Made fix for quote characters with SmartPants + parsed literal blocks conditional on Sphinx version. This hs been fixed upstream in releases >= 1.0.8 (issue 647.) git-svn-id: http://code.djangoproject.com/svn/django/trunk@16952 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/_ext/djangodocs.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py index 5d49ef0e97..21c4716d18 100644 --- a/docs/_ext/djangodocs.py +++ b/docs/_ext/djangodocs.py @@ -16,7 +16,7 @@ except ImportError: except ImportError: json = None -from sphinx import addnodes, roles +from sphinx import addnodes, roles, __version__ as sphinx_ver from sphinx.builders.html import StandaloneHTMLBuilder from sphinx.writers.html import SmartyPantsHTMLTranslator from sphinx.util.console import bold @@ -139,16 +139,17 @@ class DjangoHTMLTranslator(SmartyPantsHTMLTranslator): def depart_desc_parameterlist(self, node): self.body.append(')') - # - # Don't apply smartypants to literal blocks - # - def visit_literal_block(self, node): - self.no_smarty += 1 - SmartyPantsHTMLTranslator.visit_literal_block(self, node) + if sphinx_ver < '1.0.8': + # + # Don't apply smartypants to literal blocks + # + def visit_literal_block(self, node): + self.no_smarty += 1 + SmartyPantsHTMLTranslator.visit_literal_block(self, node) - def depart_literal_block(self, node): - SmartyPantsHTMLTranslator.depart_literal_block(self, node) - self.no_smarty -= 1 + def depart_literal_block(self, node): + SmartyPantsHTMLTranslator.depart_literal_block(self, node) + self.no_smarty -= 1 # # Turn the "new in version" stuff (versionadded/versionchanged) into a