Add ability to use int like kwarg legend(loc...) for rcParams['legend.loc']

NoyHanan · NoyHanan · commit 328f0cb47b98 · 2023-05-09T16:40:10.000+03:00
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -725,12 +725,12 @@ def validate_legend_loc(loc):
 
     Parameters
     ----------
-    loc : str | (float, float) | str((float, float))
+    loc : str | int | (float, float) | str((float, float))
         The location of the legend.
 
     Returns
     -------
-    loc : str | (float, float) or raise ValueError exception
+    loc : str | int | (float, float) or raise ValueError exception
         The location of the legend.
     """
     valid = [
@@ -745,6 +745,8 @@ def validate_legend_loc(loc):
            f"are {[*valid.values()]} | tuple(float, float) "
            f"| str(tuple(float, float))")
 
+    if isinstance(loc, int):
+        return loc
     if isinstance(loc, str):
         loc = loc.lower()
         if loc in valid:
@@ -761,7 +763,9 @@ def validate_legend_loc(loc):
             if matches and len(tuples) == 1:
                 loc = tuples[0]
     if isinstance(loc, tuple):
-        if len(loc) == 2 and all(isinstance(e, numbers.Real) for e in loc):
+        if len(loc) == 2 \
+                and all(isinstance(e, numbers.Real)
+                        and float(e) >= 0.0 for e in loc):
             return loc
     raise ValueError(msg)
 
diff --git a/lib/matplotlib/rcsetup.pyi b/lib/matplotlib/rcsetup.pyi
@@ -157,5 +157,5 @@ def validate_hist_bins(
     float
 ]: ...
 
-def validate_legend_loc(loc: str | tuple[float | int]
-                        ) -> str | tuple[float]: ...
+def validate_legend_loc(loc: str | int | tuple[float]
+                        ) -> str | int | tuple[float]: ...
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -598,17 +598,12 @@ def test_deprecation(monkeypatch):
 #         mpl.RcParams({'legend.loc': value})
 
 @pytest.mark.parametrize('value', [
+    1,
     (0.9, .7),
     '(0.9, .7)'
 ])
 def test_rcparams_legend_loc(value):
     # rcParams['legend.loc'] should allow any of the following formats.
     # if any of these are not allowed, an exception will be raised
     # test for gh issue #22338
-    _, ax = plt.subplots(1)
-    expected = ax.legend(value).get_bbox_to_anchor().bounds
-    _, ax = plt.subplots(1)
     mpl.rcParams['legend.loc'] = value
-    result = ax.legend().get_bbox_to_anchor().bounds
-
-    assert result == expected
