p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Ramiro Morales 2011-10-10 00:23:47 +00:00
parent 6d7461ffdd
commit b95c06d423
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
docs/_ext/djangodocs.py
View File

@ -16,7 +16,7 @@ except ImportError:
except ImportError: except ImportError:
json = None json = None
from sphinx import addnodes, roles from sphinx import addnodes, roles, __version__ as sphinx_ver
from sphinx.builders.html import StandaloneHTMLBuilder from sphinx.builders.html import StandaloneHTMLBuilder
from sphinx.writers.html import SmartyPantsHTMLTranslator from sphinx.writers.html import SmartyPantsHTMLTranslator
from sphinx.util.console import bold from sphinx.util.console import bold
@ -139,16 +139,17 @@ class DjangoHTMLTranslator(SmartyPantsHTMLTranslator):
def depart_desc_parameterlist(self, node): def depart_desc_parameterlist(self, node):
self.body.append(')') self.body.append(')')
# if sphinx_ver < '1.0.8':
# Don't apply smartypants to literal blocks #
# # Don't apply smartypants to literal blocks
def visit_literal_block(self, node): #
self.no_smarty += 1 def visit_literal_block(self, node):
SmartyPantsHTMLTranslator.visit_literal_block(self, node) self.no_smarty += 1
SmartyPantsHTMLTranslator.visit_literal_block(self, node)
def depart_literal_block(self, node): def depart_literal_block(self, node):
SmartyPantsHTMLTranslator.depart_literal_block(self, node) SmartyPantsHTMLTranslator.depart_literal_block(self, node)
self.no_smarty -= 1 self.no_smarty -= 1
# #
# Turn the "new in version" stuff (versionadded/versionchanged) into a # Turn the "new in version" stuff (versionadded/versionchanged) into a