Improved input type error messages for contour and spy

efiring · efiring · commit 5aa377b16710 · 2006-12-15T07:02:24.000Z
svn path=/trunk/matplotlib/; revision=2927
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -4415,6 +4415,10 @@ def spy(self, Z, precision=None, marker=None, markersize=None,
         number to specify the aspect ratio of an array element
         directly.
 
+        Two plotting styles are available: image or marker. Both
+        are available for full arrays, but only the marker style
+        works for scipy.sparse.spmatrix instances.
+
         If marker and markersize are None, an image will be
         returned and any remaining kwargs are passed to imshow;
         else, a Line2D object will be returned with the value
@@ -4442,6 +4446,8 @@ def spy(self, Z, precision=None, marker=None, markersize=None,
 
         """
         if marker is None and markersize is None:
+            if hasattr(Z, 'tocoo'):
+                raise TypeError, "Image mode does not support scipy.sparse arrays"
             Z = asarray(Z)
             if precision is None: mask = Z!=0.
             else:                 mask = absolute(Z)>precision
diff --git a/src/cntr.c b/src/cntr.c
@@ -1612,7 +1612,8 @@ Cntr_init(Cntr *self, PyObject *args, PyObject *kwds)
     if (xpa == NULL || ypa == NULL || zpa == NULL || (marg && mpa == NULL))
     {
         PyErr_SetString(PyExc_ValueError,
-            "Arguments x, y, z, mask (if present) must be 2D arrays.");
+            "Arguments x, y, z, mask (if present) must be 2D arrays.\n"
+            "x, y, z must be castable to double.");
         goto error;
     }
     iMax = zpa->dimensions[1];

Original file line number	Diff line number	Diff line change
`@@ -1612,7 +1612,8 @@ Cntr_init(Cntr self, PyObject args, PyObject *kwds)`
`1612`	`1612`	`if (xpa == NULL \|\| ypa == NULL \|\| zpa == NULL \|\| (marg && mpa == NULL))`
`1613`	`1613`	`{`
`1614`	`1614`	`PyErr_SetString(PyExc_ValueError,`
`1615`		`- "Arguments x, y, z, mask (if present) must be 2D arrays.");`
	`1615`	`+ "Arguments x, y, z, mask (if present) must be 2D arrays.\n"`
	`1616`	`+ "x, y, z must be castable to double.");`
`1616`	`1617`	`goto error;`
`1617`	`1618`	`}`
`1618`	`1619`	`iMax = zpa->dimensions[1];`