matplotlib
diff --git a/‎lib/matplotlib/scale.py
Lines changed: 16 additions & 12 deletions b/‎lib/matplotlib/scale.py
Lines changed: 16 additions & 12 deletions
diff --git a/‎lib/matplotlib/tests/test_colors.py
Lines changed: 0 additions & 1 deletion b/‎lib/matplotlib/tests/test_colors.py
Lines changed: 0 additions & 1 deletion
@@ -79,14 +79,18 @@ def limit_range_for_scale(self, vmin, vmax, minpos):
         return vmin, vmax
 
 
-class TransformScaleBase(Transform):
-    """Base transform for scales to allow a deep copy"""
+class _CopyableTransformMixin():
+    """
+    Mixin to support copy and deep copy on transforms.  This alows scales,
+    and hence norms, to be copyable.
+    """
     def __deepcopy__(self, memo):
         return self.frozen()
 
+    __copy__ = __deepcopy__
+
 
-class LinearTransform(TransformScaleBase, IdentityTransform):
-    """Mixed class for Identity"""
+class LinearTransform(_CopyableTransformMixin, IdentityTransform):
     pass
 
 
@@ -124,9 +128,9 @@ def get_transform(self):
         return LinearTransform()
 
 
-class FuncTransform(TransformScaleBase):
+class FuncTransform(_CopyableTransformMixin, Transform):
     """
-    A simple transform that takes and arbitrary function for the
+    A transform that takes and arbitrary function for the
     forward and inverse transform.
     """
 
@@ -202,7 +206,7 @@ def set_default_locators_and_formatters(self, axis):
             axis.set_minor_locator(NullLocator())
 
 
-class LogTransform(TransformScaleBase):
+class LogTransform(_CopyableTransformMixin, Transform):
     input_dims = output_dims = 1
 
     @_api.rename_parameter("3.3", "nonpos", "nonpositive")
@@ -244,7 +248,7 @@ def inverted(self):
         return InvertedLogTransform(self.base)
 
 
-class InvertedLogTransform(TransformScaleBase):
+class InvertedLogTransform(_CopyableTransformMixin, Transform):
     input_dims = output_dims = 1
 
     def __init__(self, base):
@@ -370,7 +374,7 @@ def get_transform(self):
         return self._transform
 
 
-class SymmetricalLogTransform(TransformScaleBase):
+class SymmetricalLogTransform(_CopyableTransformMixin, Transform):
     input_dims = output_dims = 1
 
     def __init__(self, base, linthresh, linscale):
@@ -402,7 +406,7 @@ def inverted(self):
                                                self.linscale)
 
 
-class InvertedSymmetricalLogTransform(TransformScaleBase):
+class InvertedSymmetricalLogTransform(_CopyableTransformMixin, Transform):
     input_dims = output_dims = 1
 
     def __init__(self, base, linthresh, linscale):
@@ -505,7 +509,7 @@ def get_transform(self):
         return self._transform
 
 
-class LogitTransform(TransformScaleBase):
+class LogitTransform(_CopyableTransformMixin, Transform):
     input_dims = output_dims = 1
 
     @_api.rename_parameter("3.3", "nonpos", "nonpositive")
@@ -531,7 +535,7 @@ def __str__(self):
         return "{}({!r})".format(type(self).__name__, self._nonpositive)
 
 
-class LogisticTransform(TransformScaleBase):
+class LogisticTransform(_CopyableTransformMixin, Transform):
     input_dims = output_dims = 1
 
     @_api.rename_parameter("3.3", "nonpos", "nonpositive")
 
@@ -1269,7 +1269,6 @@ def test_repr_html():
     png = cmap._repr_png_()
     assert base64.b64encode(png).decode('ascii') in html
     assert cmap.name in html
-<<<<<<< HEAD
     assert html.startswith('<div')
     assert html.endswith('</div>')