Handle markerfacecolor=None etc. consistenty

efiring · efiring · commit 77e497a29ffa · 2008-07-12T21:04:09.000Z
svn path=/trunk/matplotlib/; revision=5752
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -215,12 +215,6 @@ def __init__(self, xdata, ydata,
         if linestyle is None   : linestyle=rcParams['lines.linestyle']
         if marker is None      : marker=rcParams['lines.marker']
         if color is None       : color=rcParams['lines.color']
-        if markeredgecolor is None :
-            markeredgecolor='auto'
-        if markerfacecolor is None :
-            markerfacecolor='auto'
-        if markeredgewidth is None :
-            markeredgewidth=rcParams['lines.markeredgewidth']
 
         if markersize is None  : markersize=rcParams['lines.markersize']
         if antialiased is None : antialiased=rcParams['lines.antialiased']
@@ -628,6 +622,8 @@ def set_markeredgecolor(self, ec):
 
         ACCEPTS: any matplotlib color
         """
+        if ec is None :
+            ec = 'auto'
         self._markeredgecolor = ec
 
     def set_markeredgewidth(self, ew):
@@ -636,6 +632,8 @@ def set_markeredgewidth(self, ew):
 
         ACCEPTS: float value in points
         """
+        if ew is None :
+            ew = rcParams['lines.markeredgewidth']
         self._markeredgewidth = ew
 
     def set_markerfacecolor(self, fc):
@@ -644,6 +642,8 @@ def set_markerfacecolor(self, fc):
 
         ACCEPTS: any matplotlib color
         """
+        if fc is None :
+            fc = 'auto'
         self._markerfacecolor = fc
 
     def set_markersize(self, sz):
