[Numpy-svn] [numpy/numpy] d86a95: TST: Verify np.ma.take works on scalars

[GitHub]

  Branch: refs/heads/maintenance/1.11.x
  Home:   https://github.com/numpy/numpy
  Commit: d86a9596a575cdca15fd42117351ea95a050fb4c
      https://github.com/numpy/numpy/commit/d86a9596a575cdca15fd42117351ea95a050fb4c
  Author: Eric Wieser <wieser.eric at gmail.com>
  Date:   2016-05-02 (Mon, 02 May 2016)

  Changed paths:
    M numpy/ma/tests/test_core.py

  Log Message:
  -----------
  TST: Verify np.ma.take works on scalars

See #7585


  Commit: e550018d1e2a0b5bbfde5d73db93fa86f052e41a
      https://github.com/numpy/numpy/commit/e550018d1e2a0b5bbfde5d73db93fa86f052e41a
  Author: Eric Wieser <wieser.eric at gmail.com>
  Date:   2016-05-02 (Mon, 02 May 2016)

  Changed paths:
    M numpy/ma/core.py

  Log Message:
  -----------
  BUG: Ensure mask is preserved on scalars

By promoting and demoting between scalars and arrays where appropriate

See #7585


  Commit: 730e2881219f4af79ab0ad5930a3bea5ab60b098
      https://github.com/numpy/numpy/commit/730e2881219f4af79ab0ad5930a3bea5ab60b098
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2016-05-02 (Mon, 02 May 2016)

  Changed paths:
    M numpy/ma/core.py
    M numpy/ma/tests/test_core.py

  Log Message:
  -----------
  Merge pull request #7597 from charris/backport-7586

Backport 7586, Make np.ma.take works on scalars


Compare: https://github.com/numpy/numpy/compare/1a7d6d6f0fad...730e2881219f