Refactor code, linting.

deep-jkl · deep-jkl · commit 214ea3f8fc9d · 2021-09-28T10:37:44.000+02:00
diff --git a/examples/lines_bars_and_markers/marker_reference.py b/examples/lines_bars_and_markers/marker_reference.py
@@ -166,8 +166,9 @@ def split_list(a_list):
 # Advanced marker modifications with transform
 # ============================================
 #
-# Markers can be modified by passing a transform to the MarkerStyle constructor.
-# Following example shows how a supplied rotation is applied to several marker shapes.
+# Markers can be modified by passing a transform to the MarkerStyle
+# constructor. Following example shows how a supplied rotation is applied to
+# several marker shapes.
 
 common_style = {k: v for k, v in filled_marker_style.items() if k != 'marker'}
 angles = [0, 10, 20, 30, 45, 60, 90]
diff --git a/examples/lines_bars_and_markers/multivariate_marker_plot.py b/examples/lines_bars_and_markers/multivariate_marker_plot.py
@@ -4,9 +4,9 @@
 ==============================================
 
 This example shows how to use different properties of markers to plot
-multivariate datasets. Here we represent a successful baseball throw as a smiley 
-face with marker size mapped to the skill of thrower, marker rotation to the take-off angle, 
-and thrust to the marker color.
+multivariate datasets. Here we represent a successful baseball throw as a
+smiley face with marker size mapped to the skill of thrower, marker rotation to
+the take-off angle, and thrust to the marker color.
 """
 
 import numpy as np
diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py
@@ -82,9 +82,11 @@
     plt.plot([1, 2, 3], marker=11)
     plt.plot([1, 2, 3], marker=matplotlib.markers.CARETDOWNBASE)
 
-Markers join and cap styles can be customized by creating a new instance of MarkerStyle.
-A MarkerStyle can also have a custom
-`~matplotlib.transforms.Transform` allowing it to be arbitrarily rotated or offset.  
+Markers join and cap styles can be customized by creating a new instance of
+MarkerStyle.
+A MarkerStyle can also have a custom `~matplotlib.transforms.Transform`
+allowing it to be arbitrarily rotated or offset.
+
 Examples showing the use of markers:
 
 * :doc:`/gallery/lines_bars_and_markers/marker_reference`
@@ -150,14 +152,6 @@
 _empty_path = Path(np.empty((0, 2)))
 
 
-def _fast_transform_combine(t1, t2):
-    """Combine two transformations where the second one can be None."""
-    if t2 is None:
-        return t1.frozen()
-    else:
-        return (t1 + t2).frozen()
-
-
 class MarkerStyle:
     """
     A class representing marker types.
@@ -248,8 +242,9 @@ def __init__(self, marker=_unset, fillstyle=None,
         fillstyle : str, default: :rc:`markers.fillstyle`
             One of 'full', 'left', 'right', 'bottom', 'top', 'none'.
 
-        transform : Affine2D, default: None
-            Transform that will be combined with the native transform of the marker.
+        transform : transforms.Transform, default: None
+            Transform that will be combined with the native transform of the
+            marker.
 
         capstyle : CapStyle, default: None
             Cap style that will override the default cap style of the marker.
@@ -395,7 +390,10 @@ def get_transform(self):
         Return the transform to be applied to the `.Path` from
         `MarkerStyle.get_path()`.
         """
-        return _fast_transform_combine(self._transform, self._user_transform)
+        if self._user_transform is None:
+            return self._transform.frozen()
+        else:
+            return (self._transform + self._user_transform).frozen()
 
     def get_alt_path(self):
         """
@@ -411,8 +409,10 @@ def get_alt_transform(self):
         Return the transform to be applied to the `.Path` from
         `MarkerStyle.get_alt_path()`.
         """
-        return _fast_transform_combine(self._alt_transform,
-                                       self._user_transform)
+        if self._user_transform is None:
+            return self._alt_transform.frozen()
+        else:
+            return (self._alt_transform + self._user_transform).frozen()
 
     def get_snap_threshold(self):
         return self._snap_threshold
@@ -424,7 +424,7 @@ def get_user_transform(self):
 
     def transformed(self, transform: Affine2D):
         """
-        Return a new version of this marker with the transform applied. 
+        Return a new version of this marker with the transform applied.
 
         Parameters
         ----------
