Merge pull request #12736 from timhoffm/move-deprecation-message-down

anntzer · web-flow · commit 2f796c4c232a · 2018-11-04T17:03:28.000+01:00
Move deprecation note to end of docstring
diff --git a/lib/matplotlib/cbook/deprecation.py b/lib/matplotlib/cbook/deprecation.py
@@ -245,11 +245,12 @@ def wrapper(*args, **kwargs):
             return func(*args, **kwargs)
 
         old_doc = inspect.cleandoc(old_doc or '').strip('\n')
+
         message = message.strip()
-        new_doc = ('.. deprecated:: {since}\n'
-                   '   {message}\n'
+        new_doc = ('{old_doc}\n'
                    '\n'
-                   '{old_doc}'
+                   '.. deprecated:: {since}\n'
+                   '   {message}'
                    .format(since=since, message=message, old_doc=old_doc))
         if not old_doc:
             # This is to prevent a spurious 'unexected unindent' warning from
