Merge r6811 from v0_98_5_maint

svn path=/trunk/matplotlib/; revision=6812

Author: efiring

CHANGELOG

@@ -1,3 +1,5 @@
+2009-01-19 Fix bug in quiver argument handling. - EF
+
 2009-01-19 Fix bug in backend_gtk: don't delete nonexistent toolbar. - EF
 
 2009-01-16 Implement bbox_inches option for savefig. If bbox_inches is

lib/matplotlib/quiver.py

@@ -386,14 +386,13 @@ def _parse_args(self, *args):
         X, Y, U, V, C = [None]*5
         args = list(args)
         if len(args) == 3 or len(args) == 5:
-            C = ma.asarray(args.pop(-1)).ravel()
+            C = ma.asarray(args.pop(-1))
         V = ma.asarray(args.pop(-1))
         U = ma.asarray(args.pop(-1))
-        nn = np.shape(U)
-        nc = nn[0]
-        nr = 1
-        if len(nn) > 1:
-            nr = nn[1]
+        if U.ndim == 1:
+            nr, nc = 1, U.shape[0]
+        else:
+            nr, nc = U.shape
         if len(args) == 2: # remaining after removing U,V,C
             X, Y = [np.array(a).ravel() for a in args]
             if len(X) == nc and len(Y) == nr: