Remove support for deprecated legend/table locations.

QuLogic · QuLogic · commit cd84080c8044 · 2020-04-25T01:30:29.000-04:00
diff --git a/doc/api/api_changes_3.3/behaviour.rst b/doc/api/api_changes_3.3/behaviour.rst
@@ -192,3 +192,11 @@ be kept by passing it as a keyword argument to `.Axes.hist`.
 `.Legend` and `.OffsetBox` subclasses (`.PaddedBox`, `.AnchoredOffsetbox`, and
 `.AnnotationBbox`) no longer directly keep track of the visibility of their
 underlying `.Patch` artist, but instead pass that flag down to the `.Patch`.
+
+`.Legend` and `.Table` no longer allow invalid locations
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This affects legends produced on an Axes (`.Axes.legend` and `.pyplot.legend`)
+and on a Figure (`.Figure.legend` and `.pyplot.figlegend`).  Figure legends also
+no longer accept the unsupported ``'best'`` location.  Previously, invalid Axes
+locations would use ``'best'`` and invalid Figure locations would used ``'upper
+right'``.
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -444,28 +444,15 @@ def __init__(self, parent, handles, labels,
                 loc = 'upper right'
         if isinstance(loc, str):
             if loc not in self.codes:
-                if self.isaxes:
-                    cbook.warn_deprecated(
-                        "3.1", message="Unrecognized location {!r}. Falling "
-                        "back on 'best'; valid locations are\n\t{}\n"
-                        "This will raise an exception %(removal)s."
-                        .format(loc, '\n\t'.join(self.codes)))
-                    loc = 0
-                else:
-                    cbook.warn_deprecated(
-                        "3.1", message="Unrecognized location {!r}. Falling "
-                        "back on 'upper right'; valid locations are\n\t{}\n'"
-                        "This will raise an exception %(removal)s."
-                        .format(loc, '\n\t'.join(self.codes)))
-                    loc = 1
+                raise ValueError(
+                    "Unrecognized location {!r}. Valid locations are\n\t{}\n"
+                    .format(loc, '\n\t'.join(self.codes)))
             else:
                 loc = self.codes[loc]
         if not self.isaxes and loc == 0:
-            cbook.warn_deprecated(
-                "3.1", message="Automatic legend placement (loc='best') not "
-                "implemented for figure legend. Falling back on 'upper "
-                "right'. This will raise an exception %(removal)s.")
-            loc = 1
+            raise ValueError(
+                "Automatic legend placement (loc='best') not implemented for "
+                "figure legend.")
 
         self._mode = mode
         self.set_bbox_to_anchor(bbox_to_anchor, bbox_transform)
diff --git a/lib/matplotlib/table.py b/lib/matplotlib/table.py
@@ -293,12 +293,9 @@ def __init__(self, ax, loc=None, bbox=None, **kwargs):
 
         if isinstance(loc, str):
             if loc not in self.codes:
-                cbook.warn_deprecated(
-                    "3.1", message="Unrecognized location {!r}. Falling back "
-                    "on 'bottom'; valid locations are\n\t{}\n"
-                    "This will raise an exception %(removal)s."
+                raise ValueError(
+                    "Unrecognized location {!r}. Valid locations are\n\t{}"
                     .format(loc, '\n\t'.join(self.codes)))
-                loc = 'bottom'
             loc = self.codes[loc]
         self.set_figure(ax.figure)
         self._axes = ax
