Display only meaningful labels when calling legend() without args

NNemec · NNemec · commit 384992f63c0b · 2007-06-02T09:19:57.000Z
svn path=/trunk/matplotlib/; revision=3349
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2007-06-02 Display only meaningful labels when calling legend()
+           without args. - NN
+
 2007-06-02 Have errorbar follow the color cycle even if line is not plotted.
            Suppress plotting of errorbar caps for capsize=0. - NN
 
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -1056,8 +1056,8 @@ def add_line(self, line):
         line.set_clip_box(self.bbox)
 
         self._update_line_limits(line)
-        label = line.get_label()
-        if not label: line.set_label('line%d'%len(self.lines))
+        if not l.get_label():
+            l.set_label('_line%d'%len(self.lines))
         self.lines.append(line)
 
     def _update_line_limits(self, line):
@@ -2890,10 +2890,10 @@ def get_handles():
         if len(args)==0:
             handles = []
             labels = []
-            for line in get_handles():
-                label = line.get_label()
-                if label != '_nolegend_':
-                    handles.append(line)
+            for handle in get_handles():
+                label = handle.get_label()
+                if label is not None and label != '' and label[0] != '_':
+                    handles.append(handle)
                     labels.append(label)
             loc = popd(kwargs, 'loc', 1)
 
@@ -2917,7 +2917,7 @@ def get_handles():
             # LINES, LABELS, LOC
             handles, labels, loc = args
         else:
-            raise RuntimeError('Invalid arguments to legend')
+            raise TypeError('Invalid arguments to legend')
 
 
         handles = flatten(handles)
