Merge pull request #31411 from meeseeksmachine/auto-backport-of-pr-31323-on-v3.10.x

rcomer · web-flow · commit 51c85f72d6b3 · 2026-03-29T17:32:18.000+01:00
Backport PR #31323 on branch v3.10.x (FIX: Prevent crash when removing a subfigure containing subplots)
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -240,10 +240,12 @@ def remove(self):
             # clear stale callback
             self.stale_callback = None
             _ax_flag = False
-            if hasattr(self, 'axes') and self.axes:
+            ax = getattr(self, 'axes', None)
+            mouseover_set = getattr(ax, '_mouseover_set', None)
+            if mouseover_set is not None:
                 # remove from the mouse hit list
-                self.axes._mouseover_set.discard(self)
-                self.axes.stale = True
+                mouseover_set.discard(self)
+                ax.stale = True
                 self.axes = None  # decouple the artist from the Axes
                 _ax_flag = True
 
diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
@@ -1551,6 +1551,7 @@ def test_subfigures_wspace_hspace():
 def test_subfigure_remove():
     fig = plt.figure()
     sfs = fig.subfigures(2, 2)
+    sfs[1, 1].subplots()
     sfs[1, 1].remove()
     assert len(fig.subfigs) == 3
 
