diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2009-08-28 15:36:42 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2009-08-28 15:36:42 +0000 |
| commit | 2b01ee6b966b9ca298247e6717e3a5be16a92970 (patch) | |
| tree | 6bbb8ee8eebdfe2ef3eb26f13994193b313c6fe7 /numpy/linalg/linalg.py | |
| parent | c2191bc97da8a0879cec8d3e9a7a93fe9e66fcd8 (diff) | |
| parent | fddd4b9c3b8f18ba7cf386f766b70ec3328b1c69 (diff) | |
| download | numpy-2b01ee6b966b9ca298247e6717e3a5be16a92970.tar.gz | |
Re-base the date-time branch back to the trunk.
Diffstat (limited to 'numpy/linalg/linalg.py')
| -rw-r--r-- | numpy/linalg/linalg.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py index dcf7fde26..5878b909f 100644 --- a/numpy/linalg/linalg.py +++ b/numpy/linalg/linalg.py @@ -30,7 +30,7 @@ class LinAlgError(Exception): def _makearray(a): new = asarray(a) - wrap = getattr(a, "__array_wrap__", new.__array_wrap__) + wrap = getattr(a, "__array_prepare__", new.__array_wrap__) return new, wrap def isComplexType(t): @@ -1237,7 +1237,7 @@ def lstsq(a, b, rcond=-1): Notes ----- - If `b` is a matrix, then all array results returned as + If `b` is a matrix, then all array results are returned as matrices. Examples |