Fix deprecation messages.

anntzer · anntzer · commit b97cd2d0a722 · 2018-07-12T10:59:46.000+02:00
1) in generate_deprecation message, pass `addendum` to the format dict
   (otherwise formatting `%(addendum)s` will throw).
2) in warn_deprecated in the rcParams, `key` is the name of the
   deprecated object, not the whole deprecation message.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -862,11 +862,11 @@ def __setitem__(self, key, val):
                         "either import that binding first, or set the QT_API "
                         "environment variable.")
                 cbook.warn_deprecated(
-                    "2.2", key, obj_type="rcparam", addendum=addendum)
+                    "2.2", name=key, obj_type="rcparam", addendum=addendum)
             elif key in _deprecated_ignore_map:
                 version, alt_key = _deprecated_ignore_map[key]
                 cbook.warn_deprecated(
-                    version, key, obj_type="rcparam", alternative=alt_key)
+                    version, name=key, obj_type="rcparam", alternative=alt_key)
                 return
             elif key == 'examples.directory':
                 cbook.warn_deprecated(
diff --git a/lib/matplotlib/cbook/deprecation.py b/lib/matplotlib/cbook/deprecation.py
@@ -46,10 +46,9 @@ def _generate_deprecation_message(
             + (" Use %(alternative)s instead." if alternative else "")
             + (" %(addendum)s" if addendum else ""))
 
-    return (
-        message % dict(func=name, name=name, obj_type=obj_type, since=since,
-                       removal=removal, alternative=alternative)
-        + addendum)
+    return message % dict(
+        func=name, name=name, obj_type=obj_type, since=since, removal=removal,
+        alternative=alternative, addendum=addendum)
 
 
 def warn_deprecated(
