[Numpy-svn] [numpy/numpy] 824d01: BUG: Fixes return for np.ma.count if keepdims is T...

[GitHub]

  Branch: refs/heads/maintenance/1.11.x
  Home:   https://github.com/numpy/numpy
  Commit: 824d0104dcc87b1ab2c878176a64f4409bdf52d4
      https://github.com/numpy/numpy/commit/824d0104dcc87b1ab2c878176a64f4409bdf52d4
  Author: Michael Seifert <michaelseifert04 at yahoo.de>
  Date:   2016-09-05 (Mon, 05 Sep 2016)

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

  Log Message:
  -----------
  BUG: Fixes return for np.ma.count if keepdims is True and axis is None

The returned value is wrapped in an integer array of appropriate dimensions
if keepdims is True and axis is None for np.ma.count.

Also included:

- Whitespace after "," (PEP8)
- any instead of np.any when checking if any axis is out of bounds (performance)


  Commit: b863b7164dcde1de80188bbceed466d9520eed50
      https://github.com/numpy/numpy/commit/b863b7164dcde1de80188bbceed466d9520eed50
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2016-09-06 (Tue, 06 Sep 2016)

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

  Log Message:
  -----------
  Merge pull request #8020 from charris/backport-8018

Backport 8018, BUG: Fixes return for np.ma.count if keepdims is True and axis is None


Compare: https://github.com/numpy/numpy/compare/88f5645f02df...b863b7164dcd