Use lru_cache in *_class_factory.

anntzer · anntzer · commit 9ef6065ce06a · 2018-05-07T21:13:10.000-07:00
diff --git a/lib/matplotlib/axes/_subplots.py b/lib/matplotlib/axes/_subplots.py
@@ -1,3 +1,4 @@
+import functools
 import warnings
 
 from matplotlib import docstring
@@ -183,9 +184,8 @@ def _make_twin_axes(self, *kl, **kwargs):
         self._twinned_axes.join(self, ax2)
         return ax2
 
-_subplot_classes = {}
-
 
+@functools.lru_cache(None)
 def subplot_class_factory(axes_class=None):
     # This makes a new class that inherits from SubplotBase and the
     # given axes_class (which is assumed to be a subclass of Axes).
@@ -194,15 +194,10 @@ def subplot_class_factory(axes_class=None):
     # not have to be created for every type of Axes.
     if axes_class is None:
         axes_class = Axes
+    return type("%sSubplot" % axes_class.__name__,
+                (SubplotBase, axes_class),
+                {'_axes_class': axes_class})
 
-    new_class = _subplot_classes.get(axes_class)
-    if new_class is None:
-        new_class = type(str("%sSubplot") % (axes_class.__name__),
-                         (SubplotBase, axes_class),
-                         {'_axes_class': axes_class})
-        _subplot_classes[axes_class] = new_class
-
-    return new_class
 
 # This is provided for backward compatibility
 Subplot = subplot_class_factory()
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -1779,6 +1779,7 @@ def __init__(self):
         def _as_mpl_axes(self):
             # implement the matplotlib axes interface
             return PolarAxes, {'theta_offset': self.theta_offset}
+
     prj = Polar()
     prj2 = Polar()
     prj2.theta_offset = np.pi
@@ -1793,7 +1794,7 @@ def _as_mpl_axes(self):
 
     # testing axes creation with gca
     ax = plt.gca(projection=prj)
-    assert type(ax) == maxes._subplots._subplot_classes[PolarAxes]
+    assert type(ax) == maxes._subplots.subplot_class_factory(PolarAxes)
     ax_via_gca = plt.gca(projection=prj)
     assert ax_via_gca is ax
     # try getting the axes given a different polar projection
@@ -1814,7 +1815,7 @@ def _as_mpl_axes(self):
 
     # testing axes creation with subplot
     ax = plt.subplot(121, projection=prj)
-    assert type(ax) == maxes._subplots._subplot_classes[PolarAxes]
+    assert type(ax) == maxes._subplots.subplot_class_factory(PolarAxes)
     plt.close()
 
 
diff --git a/lib/mpl_toolkits/axes_grid1/parasite_axes.py b/lib/mpl_toolkits/axes_grid1/parasite_axes.py
@@ -1,4 +1,4 @@
-import six
+import functools
 
 from matplotlib import (
     artist as martist, collections as mcoll, transforms as mtransforms,
@@ -40,32 +40,21 @@ def cla(self):
             self.yaxis.set_zorder(2.5)
 
 
-_parasite_axes_classes = {}
+@functools.lru_cache(None)
 def parasite_axes_class_factory(axes_class=None):
     if axes_class is None:
         axes_class = Axes
 
-    new_class = _parasite_axes_classes.get(axes_class)
-    if new_class is None:
-        def _get_base_axes_attr(self, attrname):
-            return getattr(axes_class, attrname)
+    def _get_base_axes_attr(self, attrname):
+        return getattr(axes_class, attrname)
 
-        new_class = type(str("%sParasite" % (axes_class.__name__)),
-                         (ParasiteAxesBase, axes_class),
-                         {'_get_base_axes_attr': _get_base_axes_attr})
-        _parasite_axes_classes[axes_class] = new_class
+    return type("%sParasite" % axes_class.__name__,
+                (ParasiteAxesBase, axes_class),
+                {'_get_base_axes_attr': _get_base_axes_attr})
 
-    return new_class
 
 ParasiteAxes = parasite_axes_class_factory()
 
-# #class ParasiteAxes(ParasiteAxesBase, Axes):
-
-#     @classmethod
-#     def _get_base_axes_attr(cls, attrname):
-#         return getattr(Axes, attrname)
-
-
 
 class ParasiteAxesAuxTransBase(object):
     def __init__(self, parent_axes, aux_transform, viewlim_mode=None,
@@ -189,30 +178,22 @@ def apply_aspect(self, position=None):
         #ParasiteAxes.apply_aspect()
 
 
-
-_parasite_axes_auxtrans_classes = {}
+@functools.lru_cache(None)
 def parasite_axes_auxtrans_class_factory(axes_class=None):
     if axes_class is None:
         parasite_axes_class = ParasiteAxes
     elif not issubclass(axes_class, ParasiteAxesBase):
         parasite_axes_class = parasite_axes_class_factory(axes_class)
     else:
         parasite_axes_class = axes_class
-
-    new_class = _parasite_axes_auxtrans_classes.get(parasite_axes_class)
-    if new_class is None:
-        new_class = type(str("%sParasiteAuxTrans" % (parasite_axes_class.__name__)),
-                         (ParasiteAxesAuxTransBase, parasite_axes_class),
-                         {'_parasite_axes_class': parasite_axes_class,
-                         'name': 'parasite_axes'})
-        _parasite_axes_auxtrans_classes[parasite_axes_class] = new_class
-
-    return new_class
-
-
-ParasiteAxesAuxTrans = parasite_axes_auxtrans_class_factory(axes_class=ParasiteAxes)
+    return type("%sParasiteAuxTrans" % parasite_axes_class.__name__,
+                (ParasiteAxesAuxTransBase, parasite_axes_class),
+                {'_parasite_axes_class': parasite_axes_class,
+                 'name': 'parasite_axes'})
 
 
+ParasiteAxesAuxTrans = parasite_axes_auxtrans_class_factory(
+    axes_class=ParasiteAxes)
 
 
 def _get_handles(ax):
@@ -391,33 +372,29 @@ def get_tightbbox(self, renderer, call_axes_locator=True):
         return _bbox
 
 
-_host_axes_classes = {}
+@functools.lru_cache(None)
 def host_axes_class_factory(axes_class=None):
     if axes_class is None:
         axes_class = Axes
 
-    new_class = _host_axes_classes.get(axes_class)
-    if new_class is None:
-        def _get_base_axes(self):
-            return axes_class
+    def _get_base_axes(self):
+        return axes_class
 
-        def _get_base_axes_attr(self, attrname):
-            return getattr(axes_class, attrname)
+    def _get_base_axes_attr(self, attrname):
+        return getattr(axes_class, attrname)
 
-        new_class = type(str("%sHostAxes" % (axes_class.__name__)),
-                         (HostAxesBase, axes_class),
-                         {'_get_base_axes_attr': _get_base_axes_attr,
-                          '_get_base_axes': _get_base_axes})
+    return type("%sHostAxes" % axes_class.__name__,
+                (HostAxesBase, axes_class),
+                {'_get_base_axes_attr': _get_base_axes_attr,
+                 '_get_base_axes': _get_base_axes})
 
-        _host_axes_classes[axes_class] = new_class
-
-    return new_class
 
 def host_subplot_class_factory(axes_class):
     host_axes_class = host_axes_class_factory(axes_class=axes_class)
     subplot_host_class = subplot_class_factory(host_axes_class)
     return subplot_host_class
 
+
 HostAxes = host_axes_class_factory(axes_class=Axes)
 SubplotHost = subplot_class_factory(HostAxes)
 
diff --git a/lib/mpl_toolkits/axisartist/floating_axes.py b/lib/mpl_toolkits/axisartist/floating_axes.py
@@ -1,8 +1,8 @@
 """
 An experimental support for curvilinear grid.
 """
-import six
-from six.moves import zip
+
+import functools
 
 # TODO :
 # see if tick_iterator method can be simplified by reusing the parent method.
@@ -506,19 +506,12 @@ def adjust_axes_lim(self):
         self.set_ylim(ymin-dy, ymax+dy)
 
 
-
-_floatingaxes_classes = {}
-
+@functools.lru_cache(None)
 def floatingaxes_class_factory(axes_class):
+    return type("Floating %s" % axes_class.__name__,
+                (FloatingAxesBase, axes_class),
+                {'_axes_class_floating': axes_class})
 
-    new_class = _floatingaxes_classes.get(axes_class)
-    if new_class is None:
-        new_class = type(str("Floating %s" % (axes_class.__name__)),
-                         (FloatingAxesBase, axes_class),
-                         {'_axes_class_floating': axes_class})
-        _floatingaxes_classes[axes_class] = new_class
-
-    return new_class
 
 from .axislines import Axes
 from mpl_toolkits.axes_grid1.parasite_axes import host_axes_class_factory
