[Python-checkins] cpython (3.3): Closes #20755: port sphinx-1.1 fixes from default

Mon Feb 24 09:34:22 CET 2014

http://hg.python.org/cpython/rev/7358ca69f351
changeset: 89359:7358ca69f351
branch: 3.3
parent: 89357:de5d4a60ab95
user: Georg Brandl <georg at python.org>
date: Mon Feb 24 09:35:07 2014 +0100
summary:
 Closes #20755: port sphinx-1.1 fixes from default
files:
 Doc/tools/sphinxext/pyspecific.py | 22 +++++++++---------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py
--- a/Doc/tools/sphinxext/pyspecific.py
+++ b/Doc/tools/sphinxext/pyspecific.py
@@ -16,6 +16,7 @@
 
 import sphinx
 from sphinx.util.nodes import split_explicit_title
+from sphinx.util.compat import Directive
 from sphinx.writers.html import HTMLTranslator
 from sphinx.writers.latex import LaTeXTranslator
 from sphinx.locale import versionlabels
@@ -27,7 +28,9 @@
 Body.enum.converters['lowerroman'] = \
 Body.enum.converters['upperroman'] = lambda x: None
 
-if sphinx.__version__[:3] < '1.2':
+SPHINX11 = sphinx.__version__[:3] < '1.2'
+
+if SPHINX11:
 # monkey-patch HTML translator to give versionmodified paragraphs a class
 def new_visit_versionmodified(self, node):
 self.body.append(self.starttag(node, 'p', CLASS=node['type']))
@@ -88,8 +91,6 @@
 
 # Support for marking up implementation details
 
-from sphinx.util.compat import Directive
-
 class ImplementationDetail(Directive):
 
 has_content = True
@@ -142,10 +143,6 @@
 
 # Support for documenting version of removal in deprecations
 
-from sphinx.locale import versionlabels
-from sphinx.util.compat import Directive
-
-
 class DeprecatedRemoved(Directive):
 has_content = True
 required_arguments = 2
@@ -171,16 +168,16 @@
 messages = []
 if self.content:
 self.state.nested_parse(self.content, self.content_offset, node)
- if len(node):
 if isinstance(node[0], nodes.paragraph) and node[0].rawsource:
 content = nodes.inline(node[0].rawsource, translatable=True)
 content.source = node[0].source
 content.line = node[0].line
 content += node[0].children
 node[0].replace_self(nodes.paragraph('', '', content))
- node[0].insert(0, nodes.inline('', '%s: ' % text,
- classes=['versionmodified']))
- else:
+ if not SPHINX11:
+ node[0].insert(0, nodes.inline('', '%s: ' % text,
+ classes=['versionmodified']))
+ elif not SPHINX11:
 para = nodes.paragraph('', '',
 nodes.inline('', '%s.' % text, classes=['versionmodified']))
 node.append(para)
@@ -188,6 +185,9 @@
 env.note_versionchange('deprecated', version[0], node, self.lineno)
 return [node] + messages
 
+# for Sphinx < 1.2
+versionlabels['deprecated-removed'] = DeprecatedRemoved._label
+
 
 # Support for including Misc/NEWS
 
-- 
Repository URL: http://hg.python.org/cpython
