FIX: make scale handling less klunky

jklymak · jklymak · commit 6773228f5cdf · 2020-11-09T07:16:01.000-08:00
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -3501,8 +3501,8 @@ def set_xscale(self, value, **kwargs):
 
         Parameters
         ----------
-        value : {"linear", "log", "symlog", "logit", ...}
-            The axis scale type to apply.
+        value : {"linear", "log", "symlog", "logit", ...} or `.ScaleBase`
+            The axis scale type to apply.  
 
         **kwargs
             Different keyword arguments are accepted, depending on the scale.
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -745,7 +745,10 @@ def get_scale(self):
         return self._scale.name
 
     def _set_scale(self, value, **kwargs):
-        self._scale = mscale.scale_factory(value, self, **kwargs)
+        if not isinstance(value, mscale.ScaleBase):
+            self._scale = mscale.scale_factory(value, self, **kwargs)
+        else:
+            self._scale = value
         self._scale.set_default_locators_and_formatters(self)
 
         self.isDefault_majloc = True
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -607,12 +607,8 @@ def _reset_locator_formatter_scale(self):
         self.minorlocator = None
         self.formatter = None
         if hasattr(self.norm, '_scale'):
-            self.ax.set_xscale(self.norm._scale.name,
-                               **self.norm._scale._kwargs)
-            self.ax.set_yscale(self.norm._scale.name,
-                               **self.norm._scale._kwargs)
-            self.ax.xaxis._scale = self.norm._scale
-            self.ax.yaxis._scale = self.norm._scale
+            self.ax.set_xscale(self.norm._scale)
+            self.ax.set_yscale(self.norm._scale.name)
             self.__scale = self.norm._scale.name
         else:
             self.ax.set_xscale('linear')
diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py
@@ -53,7 +53,6 @@ def __init__(self, axis):
         be used: a single scale object should be usable by multiple
         `~matplotlib.axis.Axis`\es at the same time.
         """
-        self._kwargs = dict()
 
     def get_transform(self):
         """
@@ -93,7 +92,6 @@ def __init__(self, axis):
         # the docstring of Axis.set_scale.
         """
         """
-        self.kwargs = dict()
 
     def set_default_locators_and_formatters(self, axis):
         # docstring inherited
@@ -175,7 +173,6 @@ def forward(values: array-like) -> array-like
         forward, inverse = functions
         transform = FuncTransform(forward, inverse)
         self._transform = transform
-        self._kwargs = {'functions': functions}
 
     def get_transform(self):
         """Return the `.FuncTransform` associated with this scale."""
@@ -299,7 +296,6 @@ def __init__(*, base=10, subs=None, nonpositive="clip"):
         base, subs, nonpositive = __init__(**kwargs)
         self._transform = LogTransform(base, nonpositive)
         self.subs = subs
-        self._kwargs = kwargs
 
     base = property(lambda self: self._transform.base)
 
@@ -353,7 +349,6 @@ def forward(values: array-like) -> array-like
         forward, inverse = functions
         self.subs = None
         self._transform = FuncTransform(forward, inverse) + LogTransform(base)
-        self._kwargs = {'functions': functions, 'base': base}
 
     @property
     def base(self):
@@ -481,7 +476,6 @@ def __init__(*, base=10, linthresh=2, subs=None, linscale=1):
         base, linthresh, subs, linscale = __init__(**kwargs)
         self._transform = SymmetricalLogTransform(base, linthresh, linscale)
         self.subs = subs
-        self._kwargs = kwargs
 
     base = property(lambda self: self._transform.base)
     linthresh = property(lambda self: self._transform.linthresh)
@@ -575,8 +569,6 @@ def __init__(self, axis, nonpositive='mask', *,
         self._transform = LogitTransform(nonpositive)
         self._use_overline = use_overline
         self._one_half = one_half
-        self._kwargs = {'nonpositive': nonpositive, 'one_half': one_half,
-                        'use_overline': use_overline}
 
     def get_transform(self):
         """Return the `.LogitTransform` associated with this scale."""
