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 31d8c06dbb5e260c68c795a7f5c9683103ead935..9e251d4b5393f1428e5b3e0ee620ea5d2fb49408 100644 (file)
--- 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 3242a8134586e91691c14f0893182f0e533c5bc2..dd1a9d449a0abcd90cf76c9b67fa0a8208d6d1db 100644 (file)
--- 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 {