Fixed triplot to deal with linestyle or marker being None

lennart0901 · lennart0901 · commit 23d5e56bda7f · 2014-10-24T14:07:31.000+02:00
diff --git a/lib/matplotlib/tests/test_triangulation.py b/lib/matplotlib/tests/test_triangulation.py
@@ -765,7 +765,7 @@ def z(x, y):
     refiner = mtri.UniformTriRefiner(triang0)
     tri_refi, z_test_refi = refiner.refine_field(z0, subdiv=4)
     levels = np.arange(0., 1., 0.025)
-    plt.triplot(triang0, lw=0.5, color='0.5')
+    plt.triplot(triang0, '0.5', lw=0.5)
     plt.tricontour(tri_refi, z_test_refi, levels=levels, colors="black")
 
 
diff --git a/lib/matplotlib/tri/triplot.py b/lib/matplotlib/tri/triplot.py
@@ -5,7 +5,7 @@
 
 import numpy as np
 from matplotlib.tri.triangulation import Triangulation
-
+import matplotlib
 
 def triplot(ax, *args, **kwargs):
     """
@@ -54,6 +54,10 @@ def triplot(ax, *args, **kwargs):
     if len(args) > 0:
         fmt = args[0]
     linestyle, marker, color = matplotlib.axes._base._process_plot_format(fmt)
+    if linestyle is None:
+            linestyle = matplotlib.rcParams['lines.linestyle']
+    if marker is None:
+            marker = matplotlib.rcParams['lines.marker']
 
     # Insert plot format string into a copy of kwargs (kwargs values prevail).
     kw = kwargs.copy()
