diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2014-12-12 15:24:45 -0500 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2014-12-12 15:24:45 -0500 |
| commit | 2070ecf08a4727819b0268f761f6614a153e619c (patch) | |
| tree | f16f29d7016e547fbca7ecd0407480a915bfc030 /numpy/lib | |
| parent | 35890ae6c0e151ece1059b6052e1a41836658f31 (diff) | |
| parent | 971ae727442f83a81f52af619ea13649a6ddcf83 (diff) | |
| download | numpy-2070ecf08a4727819b0268f761f6614a153e619c.tar.gz | |
Merge pull request #5358 from Garrett-R/fix_bug_2015
Fix #2015: diag returns ndarray instead of matrix
Diffstat (limited to 'numpy/lib')
| -rw-r--r-- | numpy/lib/twodim_base.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/numpy/lib/twodim_base.py b/numpy/lib/twodim_base.py index 40a140b6b..25504e434 100644 --- a/numpy/lib/twodim_base.py +++ b/numpy/lib/twodim_base.py @@ -19,6 +19,8 @@ __all__ = [ i1 = iinfo(int8) i2 = iinfo(int16) i4 = iinfo(int32) + + def _min_int(low, high): """ get small int that fits the range """ if high <= i1.max and low >= i1.min: @@ -293,7 +295,7 @@ def diag(v, k=0): [0, 0, 8]]) """ - v = asarray(v) + v = asanyarray(v) s = v.shape if len(s) == 1: n = s[0]+abs(k) |