Merge pull request #25332 from anntzer/alg

greglucas · web-flow · commit 0489b7aedba3 · 2023-02-27T19:33:41.000-07:00
Support pickling of figures with aligned x/y labels.
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -788,6 +788,19 @@ class Grouper:
     def __init__(self, init=()):
         self._mapping = {weakref.ref(x): [weakref.ref(x)] for x in init}
 
+    def __getstate__(self):
+        return {
+            **vars(self),
+            # Convert weak refs to strong ones.
+            "_mapping": {k(): [v() for v in vs] for k, vs in self._mapping.items()},
+        }
+
+    def __setstate__(self, state):
+        vars(self).update(state)
+        # Convert strong refs to weak ones.
+        self._mapping = {weakref.ref(k): [*map(weakref.ref, vs)]
+                         for k, vs in self._mapping.items()}
+
     def __contains__(self, item):
         return weakref.ref(item) in self._mapping
 
diff --git a/lib/matplotlib/tests/test_pickle.py b/lib/matplotlib/tests/test_pickle.py
@@ -59,6 +59,7 @@ def _generate_complete_test_figure(fig_ref):
     # Ensure lists also pickle correctly.
     plt.subplot(3, 3, 1)
     plt.plot(list(range(10)))
+    plt.ylabel("hello")
 
     plt.subplot(3, 3, 2)
     plt.contourf(data, hatches=['//', 'ooo'])
@@ -69,6 +70,7 @@ def _generate_complete_test_figure(fig_ref):
 
     plt.subplot(3, 3, 4)
     plt.imshow(data)
+    plt.ylabel("hello\nworld!")
 
     plt.subplot(3, 3, 5)
     plt.pcolor(data)
@@ -91,6 +93,8 @@ def _generate_complete_test_figure(fig_ref):
     plt.errorbar(x, x * -0.5, xerr=0.2, yerr=0.4)
     plt.legend(draggable=True)
 
+    fig_ref.align_ylabels()  # Test handling of _align_label_groups Groupers.
+
 
 @mpl.style.context("default")
 @check_figures_equal(extensions=["png"])
