From 7dc480e4f723d4ddf777abf90e9c400d107d1dd0 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 16 Nov 2015 11:33:34 -0500 Subject: [PATCH] [1.8.x] Removed a docs workaround for an old Sphinx version. Backport of c315f9602418d2fcfe194b1ef2d0d7c325cac151 from master --- docs/_ext/djangodocs.py | 14 +------------- docs/conf.py | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py index 0be10899aa..29b6cc4f9d 100644 --- a/docs/_ext/djangodocs.py +++ b/docs/_ext/djangodocs.py @@ -7,7 +7,7 @@ import re from docutils import nodes from docutils.parsers.rst import Directive, directives -from sphinx import __version__ as sphinx_ver, addnodes +from sphinx import addnodes from sphinx.builders.html import StandaloneHTMLBuilder from sphinx.util.console import bold from sphinx.util.nodes import set_source_info @@ -256,18 +256,6 @@ class DjangoHTMLTranslator(SmartyPantsHTMLTranslator): def depart_desc_parameterlist(self, node): self.body.append(')') - 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 - # # Turn the "new in version" stuff (versionadded/versionchanged) into a # better callout -- the Sphinx default is just a little span, diff --git a/docs/conf.py b/docs/conf.py index 29c876b9a5..74415bc88d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -36,7 +36,7 @@ sys.path.append(abspath(join(dirname(__file__), "_ext"))) # -- General configuration ----------------------------------------------------- # If your documentation needs a minimal Sphinx version, state it here. -needs_sphinx = '1.0' +needs_sphinx = '1.0.8' # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.