[Numpy-svn] [numpy/numpy] 602836: BUG: Fix `numpy.ma.where` to be consistent with un...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/numpy/numpy
  Commit: 602836b99c2a046574dd352def24980b2da9d9b2
      https://github.com/numpy/numpy/commit/602836b99c2a046574dd352def24980b2da9d9b2
  Author: John Kirkham <kirkhamj at janelia.hhmi.org>
  Date:   2015-05-02 (Sat, 02 May 2015)

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

  Log Message:
  -----------
  BUG: Fix `numpy.ma.where` to be consistent with unmasked version.

Closes #5679.


  Commit: 63ff998b5789a5aa7ce7830a258445544f1063ae
      https://github.com/numpy/numpy/commit/63ff998b5789a5aa7ce7830a258445544f1063ae
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2015-05-02 (Sat, 02 May 2015)

  Changed paths:
    M numpy/ma/core.py

  Log Message:
  -----------
  MAINT: Refactor numpy.ma.where.

Use np._NoValue as default values of 'x' and 'y' in signature. That
allows None values to be used for compatibility with the unmasked
version of where and makes detection of the case when neither is
given easier.

Use properties *.data and *.mask instead of *._data and *._mask. That
may avoid some subtle problems.

Minor style cleanups.


  Commit: 3782f7e0bfd9ac230b672a1295df580a40e9e109
      https://github.com/numpy/numpy/commit/3782f7e0bfd9ac230b672a1295df580a40e9e109
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2015-05-02 (Sat, 02 May 2015)

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

  Log Message:
  -----------
  Merge pull request #5825 from charris/cleanup-gh-5583

BUG: Make ma.where consistent with unmasked where.


Compare: https://github.com/numpy/numpy/compare/f3e7ef7f034b...3782f7e0bfd9