Allow bool-like values for sharex/sharey (#24362)

vdbma · Marc Van den Bossche · web-flow · commit 28289122be81 · 2022-12-16T01:08:28.000+01:00
Co-authored-by: Marc Van den Bossche &lt;marc.vanden-bossche@univ-grenoble-alpes.fr&gt;
diff --git a/lib/matplotlib/gridspec.py b/lib/matplotlib/gridspec.py
@@ -276,21 +276,12 @@ def subplots(self, *, sharex=False, sharey=False, squeeze=True,
             raise ValueError("GridSpec.subplots() only works for GridSpecs "
                              "created with a parent figure")
 
-        if isinstance(sharex, bool):
+        if not isinstance(sharex, str):
             sharex = "all" if sharex else "none"
-        if isinstance(sharey, bool):
+        if not isinstance(sharey, str):
             sharey = "all" if sharey else "none"
-        # This check was added because it is very easy to type
-        # `subplots(1, 2, 1)` when `subplot(1, 2, 1)` was intended.
-        # In most cases, no error will ever occur, but mysterious behavior
-        # will result because what was intended to be the subplot index is
-        # instead treated as a bool for sharex.  This check should go away
-        # once sharex becomes kwonly.
-        if isinstance(sharex, Integral):
-            _api.warn_external(
-                "sharex argument to subplots() was an integer.  Did you "
-                "intend to use subplot() (without 's')?")
-        _api.check_in_list(["all", "row", "col", "none"],
+
+        _api.check_in_list(["all", "row", "col", "none", False, True],
                            sharex=sharex, sharey=sharey)
         if subplot_kw is None:
             subplot_kw = {}
diff --git a/lib/matplotlib/tests/test_subplots.py b/lib/matplotlib/tests/test_subplots.py
@@ -84,7 +84,7 @@ def test_shared():
     plt.close(f)
 
     # test all option combinations
-    ops = [False, True, 'all', 'none', 'row', 'col']
+    ops = [False, True, 'all', 'none', 'row', 'col', 0, 1]
     for xo in ops:
         for yo in ops:
             f, ((a1, a2), (a3, a4)) = plt.subplots(2, 2, sharex=xo, sharey=yo)
