Merge pull request #20211 from anntzer/lcg

timhoffm · web-flow · commit 8034bc9f071f · 2021-05-12T18:35:24.000+02:00
Use check_getitem in legend location resolution.
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -460,16 +460,11 @@ def __init__(self, parent, handles, labels,
             if not self.isaxes and loc in [0, 'best']:
                 loc = 'upper right'
         if isinstance(loc, str):
-            if loc not in self.codes:
-                raise ValueError(
-                    "Unrecognized location {!r}. Valid locations are\n\t{}\n"
-                    .format(loc, '\n\t'.join(self.codes)))
-            else:
-                loc = self.codes[loc]
+            loc = _api.check_getitem(self.codes, loc=loc)
         if not self.isaxes and loc == 0:
             raise ValueError(
                 "Automatic legend placement (loc='best') not implemented for "
-                "figure legend.")
+                "figure legend")
 
         self._mode = mode
         self.set_bbox_to_anchor(bbox_to_anchor, bbox_transform)
