Merge branch 'diagonal' of https://github.com/horta/dask into diagonal

dask · Feb 9, 2019 · cb57c3c · cb57c3c
2 parents 81ad3d0 + a176d5e
commit cb57c3c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/dask/array/creation.py b/dask/array/creation.py
@@ -503,7 +503,7 @@ def diag(v):
 
 @wraps(np.diagonal)
 def diagonal(a, offset=0, axis1=0, axis2=1):
-    name = 'diagonal-' + tokenize(a)
+    name = 'diagonal-' + tokenize(a, offset, axis1, axis2)
 
     if a.ndim < 2:
         # NumPy uses `diag` as we do here.
@@ -551,7 +551,7 @@ def diagonal(a, offset=0, axis1=0, axis2=1):
         return Array(dsk, name, chunks, dtype=a.dtype)
 
     if not isinstance(a, Array):
-        raise TypeError("v must be a dask array or numpy array, "
+        raise TypeError("a must be a dask array or numpy array, "
                         "got {0}".format(type(a)))
 
     chunks = list(a.chunks)