FIX: allow OrderedDict legend handles and labels

jklymak · jklymak · commit ba834ce29bd5 · 2018-01-16T15:10:37.000-08:00
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -589,14 +589,17 @@ def __init__(self, parent, handles, labels,
             setattr(self, name, value)
         del locals_view
         # trim handles and labels if illegal label...
-        for label, handle in zip(labels[:], handles[:]):
-                if (isinstance(label, six.string_types) and
-                        label.startswith('_')):
-                    warnings.warn('The handle {!r} has a label of {!r} which '
-                                  'cannot be automatically added to the '
-                                  'legend.'.format(handle, label))
-                    labels.remove(label)
-                    handles.remove(handle)
+        _lab, _hand = [], []
+        for label, handle in zip(labels, handles):
+            if (isinstance(label, six.string_types) and
+                    label.startswith('_')):
+                warnings.warn('The handle {!r} has a label of {!r} which '
+                              'cannot be automatically added to the '
+                              'legend.'.format(handle, label))
+            else:
+                _lab.append(label)
+                _hand.append(handle)
+        label, handle = _lab, _hand
 
         handles = list(handles)
         if len(handles) < 2:
