[Python-checkins] cpython (merge 3.4 -> default): Issue #22150: Fix deprecated-removed directive in Sphinx 1.2.

[berker.peksag]

http://hg.python.org/cpython/rev/8f635f77e7e9
changeset:   92183:8f635f77e7e9
parent:      92180:aeb5fc7a9956
parent:      92182:b834b1fa2aab
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Fri Aug 22 18:25:16 2014 +0300
summary:
  Issue #22150: Fix deprecated-removed directive in Sphinx 1.2.

files:
  Doc/tools/sphinxext/pyspecific.py    |  5 ++++-
  Doc/tools/sphinxext/static/basic.css |  1 +
  2 files changed, 5 insertions(+), 1 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
@@ -180,7 +180,10 @@
         elif not SPHINX11:
             para = nodes.paragraph('', '',
                 nodes.inline('', '%s.' % text, classes=['versionmodified']))
-            node.append(para)
+            if len(node):
+                node.insert(0, para)
+            else:
+                node.append(para)
         env = self.state.document.settings.env
         env.note_versionchange('deprecated', version[0], node, self.lineno)
         return [node] + messages
diff --git a/Doc/tools/sphinxext/static/basic.css b/Doc/tools/sphinxext/static/basic.css
--- a/Doc/tools/sphinxext/static/basic.css
+++ b/Doc/tools/sphinxext/static/basic.css
@@ -344,6 +344,7 @@
 
 div.deprecated p, div.deprecated-removed p {
     margin-bottom: 0;
+    margin-top: 0;
 }
 
 .system-message {

-- 
Repository URL: http://hg.python.org/cpython