Merged revisions 6818 via svnmerge from

jdh2358 · jdh2358 · commit 913105f2952f · 2009-01-22T03:12:53.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_5_maint ........ r6818 | jdh2358 | 2009-01-21 21:06:44 -0600 (Wed, 21 Jan 2009) | 1 line fixed line collections legmarker sf bug 2511280 ........ svn path=/trunk/matplotlib/; revision=6819
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -272,7 +272,7 @@ def __init__(self, parent, handles, labels,
         self._set_artist_props(self.legendPatch)
 
         self._drawFrame = True
-        
+
         # init with null renderer
         self._init_legend_box(handles, labels)
 
@@ -327,9 +327,9 @@ def draw(self, renderer):
 
         def findoffset(width, height, xdescent, ydescent):
             return _findoffset(width, height, xdescent, ydescent, renderer)
-        
+
         self._legend_box.set_offset(findoffset)
-        
+
         fontsize = renderer.points_to_pixels(self.fontsize)
 
         # if mode == fill, set the width of the legend_box to the
@@ -623,8 +623,11 @@ def _update_legend_box(self, renderer):
                 ydata = ((height-descent)/2.)*np.ones(xdata.shape, float)
                 legline.set_data(xdata, ydata)
 
-                legline_marker = legline._legmarker
-                legline_marker.set_data(xdata_marker, ydata[:len(xdata_marker)])
+                # if a line collection is added, the legmarker attr is
+                # not set so we don't need to handle it
+                if hasattr(handle, "_legmarker"):
+                    legline_marker = legline._legmarker
+                    legline_marker.set_data(xdata_marker, ydata[:len(xdata_marker)])
 
             elif isinstance(handle, Patch):
                 p = handle
@@ -765,7 +768,7 @@ def _get_anchored_bbox(self, loc, bbox, parentbbox, renderer):
                       C:"C"}
 
         c = anchor_coefs[loc]
-        
+
         fontsize = renderer.points_to_pixels(self.fontsize)
         container = parentbbox.padded(-(self.borderaxespad) * fontsize)
         anchored_box = bbox.anchored(c, container=container)
