Merge pull request #10632 from lpsinger/short-marker-path

phobson · web-flow · commit 79fb39844856 · 2018-03-02T09:09:17.000-08:00
Support markers from Paths that consist of one line segment
diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py
@@ -251,18 +251,18 @@ def set_marker(self, marker):
         if (isinstance(marker, np.ndarray) and marker.ndim == 2 and
                 marker.shape[1] == 2):
             self._marker_function = self._set_vertices
+        elif (isinstance(marker, six.string_types)
+              and cbook.is_math_text(marker)):
+            self._marker_function = self._set_mathtext_path
+        elif isinstance(marker, Path):
+            self._marker_function = self._set_path_marker
         elif (isinstance(marker, Sized) and len(marker) in (2, 3) and
                 marker[1] in (0, 1, 2, 3)):
             self._marker_function = self._set_tuple_marker
         elif (not isinstance(marker, (np.ndarray, list)) and
               marker in self.markers):
             self._marker_function = getattr(
                 self, '_set_' + self.markers[marker])
-        elif (isinstance(marker, six.string_types)
-              and cbook.is_math_text(marker)):
-            self._marker_function = self._set_mathtext_path
-        elif isinstance(marker, Path):
-            self._marker_function = self._set_path_marker
         else:
             try:
                 Path(marker)
diff --git a/lib/matplotlib/tests/test_marker.py b/lib/matplotlib/tests/test_marker.py
@@ -1,5 +1,6 @@
 import numpy as np
 from matplotlib import markers
+from matplotlib.path import Path
 
 import pytest
 
@@ -18,3 +19,10 @@ def test_markers_invalid():
     # Checking this does fail.
     with pytest.raises(ValueError):
         marker_style.set_marker(mrk_array)
+
+
+def test_marker_path():
+    marker_style = markers.MarkerStyle()
+    path = Path([[0, 0], [1, 0]], [Path.MOVETO, Path.LINETO])
+    # Checking this doesn't fail.
+    marker_style.set_marker(path)
