matplotlib
diff --git a/‎lib/matplotlib/figure.py
Lines changed: 23 additions & 7 deletions b/‎lib/matplotlib/figure.py
Lines changed: 23 additions & 7 deletions
diff --git a/‎lib/matplotlib/pyplot.py
Lines changed: 8 additions & 2 deletions b/‎lib/matplotlib/pyplot.py
Lines changed: 8 additions & 2 deletions
diff --git a/‎lib/matplotlib/tests/baseline_images/test_figure/figure_legend.pdf
227 Bytes b/‎lib/matplotlib/tests/baseline_images/test_figure/figure_legend.pdf
227 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_figure/figure_legend.png
11.5 KB b/‎lib/matplotlib/tests/baseline_images/test_figure/figure_legend.png
11.5 KB
@@ -1075,13 +1075,23 @@ def get_axes(self):
 
     def legend(self, *args, **kwargs):
         """
-        Place a legend in the figure.  Labels are a sequence of
-        strings, handles is a sequence of
-        :class:`~matplotlib.lines.Line2D` or
-        :class:`~matplotlib.patches.Patch` instances, and loc can be a
-        string or an integer specifying the legend location
+        Place a legend in the figure.
+        
+        *labels*
+          a sequence of strings
+
+        *handles*
+          a sequence of :class:`~matplotlib.lines.Line2D` or
+          :class:`~matplotlib.patches.Patch` instances
+
+        *loc*
+          can be a string or an integer specifying the legend
+          location
 
-        USAGE::
+        A :class:`matplotlib.legend.Legend` instance is returned.
+
+              
+        Example::
 
         To make a legend from existing artists on every axes::
 
@@ -1184,12 +1194,18 @@ def legend(self, *args, **kwargs):
                 return None
 
         elif len(args) == 2:
+            # LINES, LABELS
             handles, labels = args
 
+        elif len(args) == 3:
+            # LINES, LABELS, LOC
+            handles, labels, loc = args
+            kwargs['loc'] = loc
+            
         else:
             raise TypeError('Invalid arguments to legend')
 
-        l = Legend(self, handles, labels, *args, **kwargs)
+        l = Legend(self, handles, labels, **kwargs)
         self.legends.append(l)
         l._remove_method = lambda h: self.legends.remove(h)
         return l
 
@@ -627,7 +627,7 @@ def figimage(*args, **kwargs):
     return ret
 
 
-def figlegend(handles, labels, loc, **kwargs):
+def figlegend(*args, **kwargs):
     """
     Place a legend in the figure.
 
@@ -646,6 +646,12 @@ def figlegend(handles, labels, loc, **kwargs):
 
     Example::
 
+    To make a legend from existing artists on every axes::
+
+      legend()
+
+    To make a legend for a list of lines and labels::
+        
       figlegend( (line1, line2, line3),
                  ('label1', 'label2', 'label3'),
                  'upper right' )
@@ -655,7 +661,7 @@ def figlegend(handles, labels, loc, **kwargs):
        :func:`~matplotlib.pyplot.legend`
 
     """
-    l = gcf().legend(handles, labels, loc, **kwargs)
+    l = gcf().legend(*args, **kwargs)
     draw_if_interactive()
     return l