FIX: moved old ScalarMappable methods to a private method

jklymak · jklymak · commit 0a8942d7b99b · 2019-01-23T15:00:13.000-08:00
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -304,7 +304,47 @@ def tick_values(self, vmin, vmax):
         return ticks
 
 
-class ColorbarBase(object):
+class _ColorbarMappableDummy(object):
+    """
+    Private class to hold deprecated ColorbarBase methods that used to be
+    inhereted from ScalarMappable.
+    """
+    @cbook.deprecated("3.1", alternative="mappable.set_norm")
+    def set_norm(self, norm):
+        """
+        `.colorbar.Colorbar.set_norm` does nothing; set the norm on
+        the mappable associated with this colorbar.
+        """
+        pass
+
+    @cbook.deprecated("3.1", alternative="ScalarMappable.set_cmap")
+    def set_cmap(self, cmap):
+        """
+        `.colorbar.Colorbar.set_cmap` does nothing; set the norm on
+        the mappable associated with this colorbar.
+        """
+        pass
+
+    @cbook.deprecated("3.1", alternative="ScalarMappable.set_clim")
+    def set_clim(self, cmap):
+        """
+        `.colorbar.Colorbar.set_clim` does nothing; set the limits on
+        the mappable associated with this colorbar.
+        """
+        pass
+
+    @cbook.deprecated("3.1", alternative="ScalarMappable.get_cmap")
+    def get_cmap(self):
+        'return the colormap'
+        return self.cmap
+
+    @cbook.deprecated("3.1", alternative="ScalarMappable.get_clim")
+    def get_clim(self):
+        'return the min, max of the color limits for image scaling'
+        return self.norm.vmin, self.norm.vmax
+
+
+class ColorbarBase(_ColorbarMappableDummy):
     '''
     Draw a colorbar in an existing axes.
 
@@ -445,40 +485,6 @@ def draw_all(self):
         if self.filled:
             self._add_solids(X, Y, C)
 
-    @cbook.deprecated("3.1", alternative="mappable.set_norm")
-    def set_norm(self, norm):
-        """
-        `.colorbar.Colorbar.set_norm` does nothing; set the norm on
-        the mappable associated with this colorbar.
-        """
-        pass
-
-    @cbook.deprecated("3.1", alternative="ScalarMappable.set_cmap")
-    def set_cmap(self, cmap):
-        """
-        `.colorbar.Colorbar.set_cmap` does nothing; set the norm on
-        the mappable associated with this colorbar.
-        """
-        pass
-
-    @cbook.deprecated("3.1", alternative="ScalarMappable.set_clim")
-    def set_clim(self, cmap):
-        """
-        `.colorbar.Colorbar.set_clim` does nothing; set the limits on
-        the mappable associated with this colorbar.
-        """
-        pass
-
-    @cbook.deprecated("3.1", alternative="ScalarMappable.get_cmap")
-    def get_cmap(self):
-        'return the colormap'
-        return self.cmap
-
-    @cbook.deprecated("3.1", alternative="ScalarMappable.get_clim")
-    def get_clim(self):
-        'return the min, max of the color limits for image scaling'
-        return self.norm.vmin, self.norm.vmax
-
     def config_axis(self):
         ax = self.ax
 
