Merge pull request #1611 from segasai/master

mdboom · mdboom · commit df4b02dad6d0 · 2013-01-16T14:08:26.000-05:00
change handling of legend labels which are None
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -686,7 +686,10 @@ def set_label(self, s):
 
         ACCEPTS: string or anything printable with '%s' conversion.
         """
-        self._label = '%s' % (s, )
+        if s is not None:
+            self._label = '%s' % (s, )
+        else:
+            self._label = None
         self.pchanged()
 
     def get_zorder(self):
diff --git a/lib/matplotlib/container.py b/lib/matplotlib/container.py
@@ -43,7 +43,10 @@ def set_label(self, s):
 
         ACCEPTS: string or anything printable with '%s' conversion.
         """
-        self._label = '%s' % (s, )
+        if s is not None:
+            self._label = '%s' % (s, )
+        else:
+            self._label = None
         self.pchanged()
 
     def add_callback(self, func):
