MNT : remove code to handle callable legend handlers

tacaswell · tacaswell · commit d17863faa64e · 2015-01-21T20:01:07.000-05:00
Deprecated in #2442 / 9e0be95
diff --git a/doc/api/api_changes/code_removal.rst b/doc/api/api_changes/code_removal.rst
@@ -3,7 +3,13 @@ Code Removal
 
 Legend
 ------
-Removed handling of `loc` as a positional argument to `Legend`
+ - Removed handling of `loc` as a positional argument to `Legend`
+
+
+Legend handlers
+~~~~~~~~~~~~~~~
+Remove code to allow legend handlers to be callable.  They must now
+implement a method ``legend_artist``.
 
 
 Axis
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -33,8 +33,7 @@
 
 from matplotlib import rcParams
 from matplotlib.artist import Artist, allow_rasterization
-from matplotlib.cbook import (is_string_like, iterable, silent_list, safezip,
-                              warn_deprecated)
+from matplotlib.cbook import (is_string_like, iterable, silent_list, safezip)
 from matplotlib.font_manager import FontProperties
 from matplotlib.lines import Line2D
 from matplotlib.patches import Patch, Rectangle, Shadow, FancyBboxPatch
@@ -647,17 +646,6 @@ def _init_legend_box(self, handles, labels, markerfirst=True):
                                         xdescent=0., ydescent=descent)
                 handleboxes.append(handlebox)
 
-                # Deprecate the old behaviour of accepting callable
-                # legend handlers in favour of the "legend_artist"
-                # interface.
-                if (not hasattr(handler, 'legend_artist') and
-                        callable(handler)):
-                    handler.legend_artist = handler.__call__
-                    warn_deprecated('1.4',
-                                    ('Legend handers must now implement a '
-                                     '"legend_artist" method rather than '
-                                     'being a callable.'))
-
                 # Create the artist for the legend which represents the
                 # original artist/handle.
                 handle_list.append(handler.legend_artist(self, orig_handle,
diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
@@ -170,34 +170,6 @@ def test_legend_remove():
 
 class TestLegendFunction(object):
     # Tests the legend function on the Axes and pyplot.
-
-    @cleanup
-    def test_old_legend_handler_interface(self):
-        # Check the deprecated warning is created and that the appropriate
-        # call to the legend handler is made.
-        class AnyObject(object):
-            pass
-
-        class AnyObjectHandler(object):
-            def __call__(self, legend, orig_handle, fontsize, handlebox):
-                x0, y0 = handlebox.xdescent, handlebox.ydescent
-                width, height = handlebox.width, handlebox.height
-                patch = mpatches.Rectangle([x0, y0], width, height, facecolor='red',
-                                           edgecolor='black', hatch='xx', lw=3,
-                                           transform=handlebox.get_transform())
-                handlebox.add_artist(patch)
-                return patch
-
-        with mock.patch('warnings.warn') as warn:
-            plt.legend([None], ['My first handler'],
-                       handler_map={None: AnyObjectHandler()})
-
-        warn.assert_called_with('Legend handers must now implement a '
-                                '"legend_artist" method rather than '
-                                'being a callable.',
-                                MatplotlibDeprecationWarning,
-                                stacklevel=1)
-
     @cleanup
     def test_legend_handle_label(self):
         lines = plt.plot(range(10))
