[Numpy-svn] [numpy/numpy] d8d27c: STY: Minor style fixups.

[GitHub]

  Branch: refs/heads/maintenance/1.10.x
  Home:   https://github.com/numpy/numpy
  Commit: d8d27c326f2c4a8b59ea0568c5b650f0c9caf8f6
      https://github.com/numpy/numpy/commit/d8d27c326f2c4a8b59ea0568c5b650f0c9caf8f6
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2015-11-10 (Tue, 10 Nov 2015)

  Changed paths:
    M numpy/ma/core.py
    M numpy/ma/extras.py

  Log Message:
  -----------
  STY: Minor style fixups.

Fix some long lines and indentation in numpy/ma/core.py and
numpy/ma/extras.py


  Commit: 14e9cebbd2c9c2847e71b3d6d59cfa636b4a3591
      https://github.com/numpy/numpy/commit/14e9cebbd2c9c2847e71b3d6d59cfa636b4a3591
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2015-11-10 (Tue, 10 Nov 2015)

  Changed paths:
    M numpy/ma/core.py
    M numpy/ma/extras.py

  Log Message:
  -----------
  BUG, MAINT: Refactor ma.dot function and the corresponding method.

The basic implementation of ma.dot is moved from the method to the function
and the function itself is moved from extras.py to core.py on account of
import complications. The mask_rowcols function from extras is also moved
to core.py as it is needed by dot. For backwards compatibility, both
functions are still exported in extras.__all__ and can be imported
from that module. They are not included in part of core.__all__.

An out parameter is also added to ma.dot.

This PR also closes #6611.


  Commit: 2f47d47dcd5e326b11380c1af7b3a33d2b94f0dd
      https://github.com/numpy/numpy/commit/2f47d47dcd5e326b11380c1af7b3a33d2b94f0dd
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2015-11-10 (Tue, 10 Nov 2015)

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

  Log Message:
  -----------
  TST: Add tests for ma.dot.

Test that ma.dot always returns a masked array.
Test basic that the new out parameter in ma.dot works.


  Commit: 70a3fdffaa663f7713864d99735b7cf10588de0d
      https://github.com/numpy/numpy/commit/70a3fdffaa663f7713864d99735b7cf10588de0d
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2015-11-10 (Tue, 10 Nov 2015)

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

  Log Message:
  -----------
  Merge pull request #6663 from charris/fix-ma-dot

Backport 6653.


Compare: https://github.com/numpy/numpy/compare/f6f2c5e5f1e2...70a3fdffaa66