Some unrelated cleanups.

anntzer · anntzer · commit 4818c2783c30 · 2018-05-07T19:00:18.000-07:00
1) Simplify a bit the pickling setup for SubplotBase subclasses
   (basically, there was one layer of callable that was unnecessary).
2) Remove some commented out code that doesn't seem to achieve much, and
   has likely been commented out for years now.
3) No need to define `__internal_repr__` in mathtext and have `__repr__`
   call it; directly defining `__repr__` is sufficient.
4) The current definition of `Patch.__str__` has `str(Patch())` return
   `"Patch'&gt;"`, which is clearly worse than even the default repr.  I
   guess the intent was just to return `"Patch"`, but that's not the
   point of this PR; that can go in another PR if desired.
diff --git a/lib/matplotlib/axes/_subplots.py b/lib/matplotlib/axes/_subplots.py
@@ -87,18 +87,13 @@ def __init__(self, fig, *args, **kwargs):
                     pos=True, subplot=True, artist=self)
 
     def __reduce__(self):
-        # get the first axes class which does not
-        # inherit from a subplotbase
-
-        def not_subplotbase(c):
-            return issubclass(c, Axes) and not issubclass(c, SubplotBase)
-
-        axes_class = [c for c in self.__class__.mro()
-                      if not_subplotbase(c)][0]
-        r = [_PicklableSubplotClassConstructor(),
-             (axes_class,),
-             self.__getstate__()]
-        return tuple(r)
+        # get the first axes class which does not inherit from a subplotbase
+        axes_class = next(
+            c for c in type(self).__mro__
+            if issubclass(c, Axes) and not issubclass(c, SubplotBase))
+        return (_picklable_subplot_class_constructor,
+                (axes_class,),
+                self.__getstate__())
 
     def get_geometry(self):
         """get the subplot geometry, e.g., 2,2,3"""
@@ -213,48 +208,14 @@ def subplot_class_factory(axes_class=None):
 Subplot = subplot_class_factory()
 
 
-class _PicklableSubplotClassConstructor(object):
+def _picklable_subplot_class_constructor(axes_class):
     """
-    This stub class exists to return the appropriate subplot
-    class when __call__-ed with an axes class. This is purely to
-    allow Pickling of Axes and Subplots.
+    This stub class exists to return the appropriate subplot class when called
+    with an axes class. This is purely to allow pickling of Axes and Subplots.
     """
-    def __call__(self, axes_class):
-        # create a dummy object instance
-        subplot_instance = _PicklableSubplotClassConstructor()
-        subplot_class = subplot_class_factory(axes_class)
-        # update the class to the desired subplot class
-        subplot_instance.__class__ = subplot_class
-        return subplot_instance
+    subplot_class = subplot_class_factory(axes_class)
+    return subplot_class.__new__(subplot_class)
 
 
 docstring.interpd.update(Axes=martist.kwdoc(Axes))
 docstring.interpd.update(Subplot=martist.kwdoc(Axes))
-
-"""
-# this is some discarded code I was using to find the minimum positive
-# data point for some log scaling fixes.  I realized there was a
-# cleaner way to do it, but am keeping this around as an example for
-# how to get the data out of the axes.  Might want to make something
-# like this a method one day, or better yet make get_verts an Artist
-# method
-
-            minx, maxx = self.get_xlim()
-            if minx<=0 or maxx<=0:
-                # find the min pos value in the data
-                xs = []
-                for line in self.lines:
-                    xs.extend(line.get_xdata(orig=False))
-                for patch in self.patches:
-                    xs.extend([x for x,y in patch.get_verts()])
-                for collection in self.collections:
-                    xs.extend([x for x,y in collection.get_verts()])
-                posx = [x for x in xs if x>0]
-                if len(posx):
-
-                    minx = min(posx)
-                    maxx = max(posx)
-                    # warning, probably breaks inverted axis
-                    self.set_xlim((0.1*minx, maxx))
-
-"""
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -1360,9 +1360,6 @@ def __init__(self):
         self.size = 0
 
     def __repr__(self):
-        return self.__internal_repr__()
-
-    def __internal_repr__(self):
         return self.__class__.__name__
 
     def get_kerning(self, next):
@@ -1449,7 +1446,7 @@ def __init__(self, c, state, math=True):
         # pack phase, after we know the real fontsize
         self._update_metrics()
 
-    def __internal_repr__(self):
+    def __repr__(self):
         return '`%s`' % self.c
 
     def _update_metrics(self):
@@ -1547,7 +1544,7 @@ def __init__(self, elements):
 
     def __repr__(self):
         return '[%s <%.02f %.02f %.02f %.02f> %s]' % (
-            self.__internal_repr__(),
+            super().__repr__(),
             self.width, self.height,
             self.depth, self.shift_amount,
             ' '.join([repr(x) for x in self.children]))
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -38,9 +38,6 @@ class Patch(artist.Artist):
     # subclass-by-subclass basis.
     _edge_default = False
 
-    def __str__(self):
-        return str(self.__class__).split('.')[-1]
-
     def __init__(self,
                  edgecolor=None,
                  facecolor=None,
