Merged revisions 7607 via svnmerge from

leejjoon · leejjoon · commit b8ebabea2181 · 2009-08-31T00:38:43.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint ........ r7607 | leejjoon | 2009-08-30 20:32:12 -0400 (Sun, 30 Aug 2009) | 1 line fix sf bug #2839919 ........ svn path=/trunk/matplotlib/; revision=7608
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -591,8 +591,9 @@ def _init_legend_box(self, handles, labels):
         # We calculate number of lows in each column. The first
         # (num_largecol) columns will have (nrows+1) rows, and remaing
         # (num_smallcol) columns will have (nrows) rows.
-        nrows, num_largecol = divmod(len(handleboxes), self._ncol)
-        num_smallcol = self._ncol-num_largecol
+        ncol = min(self._ncol, len(handleboxes))
+        nrows, num_largecol = divmod(len(handleboxes), ncol)
+        num_smallcol = ncol-num_largecol
 
         # starting index of each column and number of rows in it.
         largecol = safezip(range(0, num_largecol*(nrows+1), (nrows+1)),
@@ -860,3 +861,4 @@ def _find_best_position(self, width, height, renderer, consider=None):
 
         return ox, oy
 
+
