Merge pull request matplotlib#1854 from ajdawson/bugfix-marker-list

dmcdougall · dmcdougall · commit 12a8b6427550 · 2013-03-24T09:52:39.000-07:00
BF - prevent a TypeError for lists of vertices
diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py
@@ -164,7 +164,7 @@ def set_marker(self, marker):
             self._marker_function = self._set_tuple_marker
         elif isinstance(marker, np.ndarray):
             self._marker_function = self._set_vertices
-        elif marker in self.markers:
+        elif not isinstance(marker, list) and marker in self.markers:
             self._marker_function = getattr(
                 self, '_set_' + self.markers[marker])
         elif is_string_like(marker) and is_math_text(marker):
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/vertex_markers.png b/lib/matplotlib/tests/baseline_images/test_axes/vertex_markers.png
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -1006,6 +1006,20 @@ def test_transparent_markers():
     ax = fig.add_subplot(111)
     ax.plot(data, 'D', mfc='none', markersize=100)
 
+@image_comparison(baseline_images=['vertex_markers'], extensions=['png'],
+                  remove_text=True)
+def test_vertex_markers():
+    data = range(10)
+    marker_as_tuple = ((-1, -1), (1, -1), (1, 1), (-1, 1))
+    marker_as_list = [(-1, -1), (1, -1), (1, 1), (-1, 1)]
+    fig = plt.figure()
+    ax = fig.add_subplot(111)
+    ax.plot(data, linestyle='', marker=marker_as_tuple, mfc='k')
+    ax.plot(data[::-1], linestyle='', marker=marker_as_list, mfc='b')
+    ax.set_xlim([-1, 10])
+    ax.set_ylim([-1, 10])
+
+
 if __name__=='__main__':
     import nose
     nose.runmodule(argv=['-s','--with-doctest'], exit=False)
