8000 Merge remote-tracking branch 'origin/v1.1.x' · gregglind/matplotlib@dfc66d5 · GitHub
[go: up one dir, main page]
Skip to content

Commit dfc66d5

Browse files
mdboommdboom
committed
Merge remote-tracking branch 'origin/v1.1.x'
Conflicts: lib/matplotlib/cbook.py
2 parents 480f1ef + 23cdfaa commit dfc66d5

File tree

2 files changed

+36
-22
lines changed

2 files changed

+36
-22
lines changed

‎lib/matplotlib/cbook.py

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import os.path
1515
import random
1616
from functools import reduce
17+
1718
import matplotlib
1819

1920
major, minor1, minor2, s, tmp = sys.version_info
@@ -31,9 +32,6 @@ def addinfourl(data, headers, url, code=None):
3132
return urllib2.addinfourl(io.StringIO(data),
3233
headers, url, code)
3334

34-
import matplotlib
35-
36-
3735
# On some systems, locale.getpreferredencoding returns None,
3836
# which can break unicode; and the sage project reports that
3937
# some systems have incorrect locale specifications, e.g.,
@@ -43,16 +41,18 @@ def addinfourl(data, headers, url, code=None):
4341
# On some systems, getpreferredencoding sets the locale, which has
4442
# side effects. Passing False eliminates those side effects.
4543

46-
try:
47-
preferredencoding = locale.getpreferredencoding(
48-
matplotlib.rcParams['axes.formatter.use_locale']).strip()
49-
if not preferredencoding:
50-
preferredencoding = None
51-
except (ValueError, ImportError, AttributeError):
52-
preferredencoding = None
53-
5444
if sys.version_info[0] >= 3:
5545
def unicode_safe(s):
46+
import matplotlib
47+
48+
try:
49+
preferredencoding = locale.getpreferredencoding(
50+
matplotlib.rcParams['axes.formatter.use_locale']).strip()
51+
if not preferredencoding:
52+
preferredencoding = None
53+
except (ValueError, ImportError, AttributeError):
54+
preferredencoding = None
55+
5656
if isinstance(s, bytes):
5757
if preferredencoding is None:
5858
return unicode(s)
@@ -63,6 +63,16 @@ def unicode_safe(s):
6363
return s
6464
else:
6565
def unicode_safe(s):
66+
import matplotlib
67+
68+
try:
69+
preferredencoding = locale.getpreferredencoding(
70+
matplotlib.rcParams['axes.formatter.use_locale']).strip()
71+
if not preferredencoding:
72+
preferredencoding = None
73+
except (ValueError, ImportError, AttributeError):
74+
preferredencoding = None
75+
6676
if preferredencoding is None: return unicode(s)
6777
else: return unicode(s, preferredencoding)
6878

‎lib/matplotlib/lines.py

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -509,8 +509,15 @@ def draw(self, renderer):
509509
if self._marker:
510510
gc = renderer.new_gc()
511511
self._set_gc_clip(gc)
512-
gc.set_foreground(self.get_markeredgecolor())
513-
gc.set_linewidth(self._markeredgewidth)
512+
rgbFace = self._get_rgb_face()
513+
rgbFaceAlt = self._get_rgb_face(alt=True)
514+
edgecolor = self.get_markeredgecolor()
515+
if is_string_like(edgecolor) and edgecolor.lower() == 'none':
516+
gc.set_linewidth(0)
517+
gc.set_foreground(rgbFace)
518+
else:
519+
gc.set_foreground(edgecolor)
520+
gc.set_linewidth(self._markeredgewidth)
514521
gc.set_alpha(self._alpha)
515522
marker = self._marker
516523
tpath, affine = self._transformed_path.get_transformed_points_and_affine()
@@ -540,18 +547,16 @@ def draw(self, renderer):
540547
w = renderer.points_to_pixels(self._markersize)
541548
if marker.get_marker() != ',': # Don't scale for pixels
542549
marker_trans = marker_trans.scale(w)
543-
rgbFace = self._get_rgb_face()
544550
renderer.draw_markers(
545551
gc, marker_path, marker_trans, subsampled, affine.frozen(),
546552
rgbFace)
547553
alt_marker_path = marker.get_alt_path()
548554
if alt_marker_path:
549555
alt_marker_trans = marker.get_alt_transform()
550556
alt_marker_trans = alt_marker_trans.scale(w)
551-
rgbFace = self._get_rgb_face(alt=True)
552557
renderer.draw_markers(
553558
gc, alt_marker_path, alt_marker_trans, subsampled,
554-
affine.frozen(), rgbFace)
559+
affine.frozen(), rgbFaceAlt)
555560

556561
gc.restore()
557562

@@ -568,16 +573,15 @@ def get_marker(self): return self._marker.get_marker()
568573

569574
def get_markeredgecolor(self):
570575
if (is_string_like(self._markeredgecolor) and
571-
self._markeredgecolor == 'auto'):
576+
self._markeredgecolor == 'auto'):
577+
if self._marker.get_marker() in ('.', ','):
578+
return self._color
572579
if self._marker.is_filled():
573-
return 'k'
580+
return 'k' # Bad hard-wired default...
574581
else:
575582
return self._color
576-
else:
577-
return self._markeredgecolor
578-
579-
580583
return self._markeredgecolor
584+
581585
def get_markeredgewidth(self): return self._markeredgewidth
582586

583587
def _get_markerfacecolor(self, alt=False):

0 commit comments

Comments
 (0)
0