From: Berker Peksag <berker.peksag@gmail.com>
Date: Fri, 22 Aug 2014 15:24:29 +0000 (+0300)
Subject: Issue #22150: Fix deprecated-removed directive in Sphinx 1.2.
X-Git-Tag: v3.4.2rc1~99
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb265ab873b6341444f0a5fc3967572688fafe62;p=thirdparty%2FPython%2Fcpython.git

Issue #22150: Fix deprecated-removed directive in Sphinx 1.2.
---

diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py
index 31d8c06dbb5e..9e251d4b5393 100644
--- a/Doc/tools/sphinxext/pyspecific.py
+++ b/Doc/tools/sphinxext/pyspecific.py
@@ -180,7 +180,10 @@ class DeprecatedRemoved(Directive):
         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
index 3242a8134586..dd1a9d449a0a 100644
--- a/Doc/tools/sphinxext/static/basic.css
+++ b/Doc/tools/sphinxext/static/basic.css
@@ -344,6 +344,7 @@ dl.glossary dt {
 
 div.deprecated p, div.deprecated-removed p {
     margin-bottom: 0;
+    margin-top: 0;
 }
 
 .system-message {