[Numpy-svn] [numpy/numpy] 2f1113: BUG: fix potentially infinite recursion in VOID_no...

[GitHub]

  Branch: refs/heads/maintenance/1.7.x
  Home:   https://github.com/numpy/numpy
  Commit: 2f1113335f58ab059c68834e3929a673d1e7d57d
      https://github.com/numpy/numpy/commit/2f1113335f58ab059c68834e3929a673d1e7d57d
  Author: Edward Catmur <ecatmur at ahl.com>
  Date:   2013-05-09 (Thu, 09 May 2013)

  Changed paths:
    M numpy/core/src/multiarray/arraytypes.c.src

  Log Message:
  -----------
  BUG: fix potentially infinite recursion in VOID_nonzero. Fixes #3312.


  Commit: 7e588870a5412feb2ace16156c9a93bdbea051cb
      https://github.com/numpy/numpy/commit/7e588870a5412feb2ace16156c9a93bdbea051cb
  Author: Edward Catmur <ecatmur at ahl.com>
  Date:   2013-05-09 (Thu, 09 May 2013)

  Changed paths:
    M numpy/core/tests/test_regression.py

  Log Message:
  -----------
  TST: add a test for issue #3312


  Commit: fdcac66527558d71a85a5b0e6b4a491777ffb9c6
      https://github.com/numpy/numpy/commit/fdcac66527558d71a85a5b0e6b4a491777ffb9c6
  Author: njsmith <njs at pobox.com>
  Date:   2013-05-09 (Thu, 09 May 2013)

  Changed paths:
    M numpy/core/src/multiarray/arraytypes.c.src
    M numpy/core/tests/test_regression.py

  Log Message:
  -----------
  Merge pull request #3317 from ecatmur/maintenance/1.7.x

Backport #3313 to maintenance/1.7.x


Compare: https://github.com/numpy/numpy/compare/3360dea7cc8b...fdcac6652755