Merge pull request #10031 from dstansby/legend-colors

jklymak · web-flow · commit fb2c15b361cd · 2017-12-20T08:11:54.000-08:00
Fix legend color comparisions
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -37,6 +37,7 @@
 from matplotlib import docstring
 from matplotlib.artist import Artist, allow_rasterization
 from matplotlib.cbook import silent_list, is_hashable
+import matplotlib.colors as colors
 from matplotlib.font_manager import FontProperties
 from matplotlib.lines import Line2D
 from matplotlib.patches import Patch, Rectangle, Shadow, FancyBboxPatch
@@ -1346,7 +1347,7 @@ def _get_legend_handles_labels(axs, legend_handler_map=None):
     labels = []
 
     def _in_handles(h, l):
-         # Method to check if we already have a given handle and label.
+        # Method to check if we already have a given handle and label.
         # Consider two handles to be the same if they share a label,
         # color, facecolor, and edgecolor.
 
@@ -1357,17 +1358,20 @@ def _in_handles(h, l):
             if type(f_h) != type(h):
                 continue
             try:
-                if f_h.get_color() != h.get_color():
+                if (colors.to_rgba_array(f_h.get_color()) !=
+                        colors.to_rgba_array(h.get_color())).any():
                     continue
             except AttributeError:
                 pass
             try:
-                if f_h.get_facecolor() != h.get_facecolor():
+                if (colors.to_rgba_array(f_h.get_facecolor()) !=
+                        colors.to_rgba_array(h.get_facecolor())).any():
                     continue
             except AttributeError:
                 pass
             try:
-                if f_h.get_edgecolor() != h.get_edgecolor():
+                if (colors.to_rgba_array(f_h.get_edgecolor()) !=
+                        colors.to_rgba_array(h.get_edgecolor())).any():
                     continue
             except AttributeError:
                 pass
@@ -1376,9 +1380,9 @@ def _in_handles(h, l):
 
     for handle in _get_legend_handles(axs, legend_handler_map):
         label = handle.get_label()
-        if (label
-                and not label.startswith('_')
-                and not _in_handles(handle, label)):
+        if (label and
+                not label.startswith('_') and
+                not _in_handles(handle, label)):
             handles.append(handle)
             labels.append(label)
     return handles, labels
