[Numpy-svn] [numpy/numpy] 59fbef: BUG: ma.make_mask should always return nomask for ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/numpy/numpy
  Commit: 59fbef0510c9a24d6f07ce80bb92fc57718ae95f
      https://github.com/numpy/numpy/commit/59fbef0510c9a24d6f07ce80bb92fc57718ae95f
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

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

  Log Message:
  -----------
  BUG: ma.make_mask should always return nomask for nomask argument.

When the mask argument was nomask, commit 8da9c71 changed the behavior
to depend on shrink=True as well, resulting in array(False) false being
returned when shrink=True, which in turn led to bugs because nomask is a
singleton and is detected by `mask is nomask`. That dectection fails
when nomask is replaced by array(False).

Closes #6667.


  Commit: 628d55c08f753ea8714d29a453587f901e5bcb80
      https://github.com/numpy/numpy/commit/628d55c08f753ea8714d29a453587f901e5bcb80
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M doc/release/1.10.2-notes.rst

  Log Message:
  -----------
  DOC: Update 1.10.2-notes.

Document fix to ma.make_mask.


  Commit: 4be9ce7bea3321af3c9896da98c751f03459fa38
      https://github.com/numpy/numpy/commit/4be9ce7bea3321af3c9896da98c751f03459fa38
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2015-11-12 (Thu, 12 Nov 2015)

  Changed paths:
    M doc/release/1.10.2-notes.rst
    M numpy/ma/core.py
    M numpy/ma/tests/test_core.py

  Log Message:
  -----------
  Merge pull request #6668 from charris/fix-make_mask

BUG: ma.make_mask should always return nomask for nomask argument.


Compare: https://github.com/numpy/numpy/compare/76a75953e35b...4be9ce7bea33