[Numpy-svn] [numpy/numpy] c8a098: BUG/TST: Fix #6760 by correctly describing mask on...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/numpy/numpy
  Commit: c8a09822c707f320d8c8ac242a8628de690a5899
      https://github.com/numpy/numpy/commit/c8a09822c707f320d8c8ac242a8628de690a5899
  Author: Gerrit Holl <g.holl at reading.ac.uk>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

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

  Log Message:
  -----------
  BUG/TST: Fix #6760 by correctly describing mask on nested subdtypes

Fix #6760.  In ma.core._recursive_make_descr, consider the case where a
subdtype does itself have named fields.  This ensures the correct mask for
an array like `ma.zeros(2, dtype([("A", "(2,2)i1,(2,2)i1", (2,2))]))`.


  Commit: d69d51c0d26fef3f8914aaa3d9af21348fe7a043
      https://github.com/numpy/numpy/commit/d69d51c0d26fef3f8914aaa3d9af21348fe7a043
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

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

  Log Message:
  -----------
  Merge pull request #6761 from gerritholl/structured_nested_masked_array_maskfill

BUG/TST: Fix #6760 by correctly describing mask on nested subdtypes


Compare: https://github.com/numpy/numpy/compare/1a097894a6da...d69d51c0d26f