Simplify pickling support.

anntzer · anntzer · commit b923ef3a3068 · 2020-05-01T20:04:42.000+02:00
- silent_list is directly picklable as is; no need to do anything about
  it.  While we're at it, also get rid of `__str__` -- `__str__` is
  documented to fall back on `__repr__`, so the latter is sufficient.
- When pickling GridSpec and SubplotSpec, set _layoutbox to None, so
  that no special loading is needed.
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
@@ -256,16 +256,6 @@ def __init__(self, type, seq=None):
     def __repr__(self):
         return '<a list of %d %s objects>' % (len(self), self.type)
 
-    __str__ = __repr__
-
-    def __getstate__(self):
-        # store a dictionary of this SilentList's state
-        return {'type': self.type, 'seq': self[:]}
-
-    def __setstate__(self, state):
-        self.type = state['type']
-        self.extend(state['seq'])
-
 
 @deprecated("3.3")
 class IgnoredKeywordWarning(UserWarning):
diff --git a/lib/matplotlib/gridspec.py b/lib/matplotlib/gridspec.py
@@ -312,17 +312,7 @@ def __init__(self, nrows, ncols, figure=None,
     _AllowedKeys = ["left", "bottom", "right", "top", "wspace", "hspace"]
 
     def __getstate__(self):
-        state = self.__dict__
-        try:
-            state.pop('_layoutbox')
-        except KeyError:
-            pass
-        return state
-
-    def __setstate__(self, state):
-        self.__dict__ = state
-        # layoutboxes don't survive pickling...
-        self._layoutbox = None
+        return {**self.__dict__, "_layoutbox": None}
 
     def update(self, **kwargs):
         """
@@ -580,17 +570,7 @@ def num2(self, value):
         self._num2 = value
 
     def __getstate__(self):
-        state = self.__dict__
-        try:
-            state.pop('_layoutbox')
-        except KeyError:
-            pass
-        return state
-
-    def __setstate__(self, state):
-        self.__dict__ = state
-        # layoutboxes don't survive pickling...
-        self._layoutbox = None
+        return {**self.__dict__, "_layoutbox": None}
 
     def get_gridspec(self):
         return self._gridspec
