[Numpy-svn] [numpy/numpy] 819b3a: BUG: Closes #2015: diag returns ndarray

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/numpy/numpy
  Commit: 819b3a8a019469774a5343afd87ec71ec696bf80
      https://github.com/numpy/numpy/commit/819b3a8a019469774a5343afd87ec71ec696bf80
  Author: Garrett-R <garrettreynolds5 at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M numpy/core/fromnumeric.py
    M numpy/lib/twodim_base.py
    M numpy/matrixlib/tests/test_numeric.py

  Log Message:
  -----------
  BUG: Closes #2015: diag returns ndarray

If x is a matrix, np.diag(x) and np.diagonal(x) now return matrices
instead of arrays.  Both of these cause x.diagonal() to be called.
That means they return row vectors (just like x.flatten(), x.ravel(),
x.cumprod(), etc.)


  Commit: 971ae727442f83a81f52af619ea13649a6ddcf83
      https://github.com/numpy/numpy/commit/971ae727442f83a81f52af619ea13649a6ddcf83
  Author: Garrett-R <garrettreynolds5 at gmail.com>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M numpy/core/fromnumeric.py
    M numpy/lib/twodim_base.py

  Log Message:
  -----------
  Improved PEP-8 compliance


  Commit: 2070ecf08a4727819b0268f761f6614a153e619c
      https://github.com/numpy/numpy/commit/2070ecf08a4727819b0268f761f6614a153e619c
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2014-12-12 (Fri, 12 Dec 2014)

  Changed paths:
    M numpy/core/fromnumeric.py
    M numpy/lib/twodim_base.py
    M numpy/matrixlib/tests/test_numeric.py

  Log Message:
  -----------
  Merge pull request #5358 from Garrett-R/fix_bug_2015

Fix #2015: diag returns ndarray instead of matrix


Compare: https://github.com/numpy/numpy/compare/35890ae6c0e1...2070ecf08a47