Merge pull request matplotlib#11265 from anntzer/cleanups

Minor cleanups.

Author: timhoffm

doc/api/next_api_changes/2018-02-15-AL-deprecations.rst

@@ -12,6 +12,7 @@ The following classes, methods, functions, and attributes are deprecated:
 
 - ``afm.parse_afm``,
 - ``backend_pgf.get_texcommand``,
+- ``backend_ps.get_bbox``,
 - ``backend_qt5.error_msg_qt``, ``backend_qt5.exception_handler``,
 - ``backend_wx.FigureCanvasWx.macros``,
 - ``cbook.GetRealpathAndStat``, ``cbook.Locked``,

lib/matplotlib/backends/backend_ps.py

@@ -1593,6 +1593,7 @@ def get_bbox_header(lbrt, rotated=False):
 
 # get_bbox is deprecated. I don't see any reason to use ghostscript to
 # find the bounding box, as the required bounding box is alread known.
+@cbook.deprecated("3.0")
 def get_bbox(tmpfile, bbox):
     """
     Use ghostscript's bbox device to find the center of the bounding box.

lib/matplotlib/legend.py

@@ -1124,7 +1124,7 @@ def set_draggable(self, state, use_blit=False, update='loc'):
         Parameters
         ----------
         state : bool
-            ``True`` / ``False`` enables / disables mouse dragging.
+            Whether mouse dragging is enabled.
         use_blit : bool, optional
             Use blitting for faster image composition. For details see
             :ref:`func-animation`.

lib/matplotlib/tests/test_rcparams.py

@@ -457,11 +457,8 @@ def test_rcparams_reset_after_fail():
 
 
 def test_if_rctemplate_is_up_to_date():
-    # This tests if the matplotlibrc.template file
-    # contains all valid rcParams.
-    dep1 = mpl._all_deprecated
-    dep2 = mpl._deprecated_set
-    deprecated = list(dep1.union(dep2))
+    # This tests if the matplotlibrc.template file contains all valid rcParams.
+    deprecated = {*mpl._all_deprecated, *mpl._deprecated_set}
     path_to_rc = os.path.join(mpl.get_data_path(), 'matplotlibrc')
     with open(path_to_rc, "r") as f:
         rclines = f.readlines()