Merge branch 'master' from upstream into fillstyle_none.

Conflicts: lib/matplotlib/lines.py lib/matplotlib/markers.py
matplotlib · efiring · Dec 31, 2011 · Aug 31, 2011 · Aug 31, 2011 · Sep 8, 2011
commit 9cff4e4d368f98ad68325785f199fd9ad4c1323b
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -574,8 +574,10 @@ def get_marker(self): return self._marker.get_marker()
    def get_markeredgecolor(self):
        mec = self._markeredgecolor
        if (is_string_like(mec) and mec == 'auto'):
+            if self._marker.get_marker() in ('.', ','):
+                return self._color
            if self._marker.is_filled() and self.get_fillstyle() != 'none':
-                return 'k'
+                return 'k'  # Bad hard-wired default...
            else:
                return self._color
        else:

diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py
@@ -100,7 +100,7 @@ class MarkerStyle:
    # is calculated in the _set_* functions.
    filled_markers = (
        'o', 'v', '^', '<', '>', '8', 's', 'p', '*', 'h', 'H', 'D', 'd')
-        
+
    fillstyles = ('full', 'left' , 'right' , 'bottom' , 'top', 'none')
    _half_fillstyles = ('left' , 'right' , 'bottom' , 'top')