[Numpy-svn] [numpy/numpy] 2371f1: BUG: Fix infinite recursion in str.format of flex ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/numpy/numpy
  Commit: 2371f139c2d3b6eabd7eab7c95e875b72a0ec219
      https://github.com/numpy/numpy/commit/2371f139c2d3b6eabd7eab7c95e875b72a0ec219
  Author: Daniel da Silva <daniel at meltingwax.net>
  Date:   2014-03-01 (Sat, 01 Mar 2014)

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

  Log Message:
  -----------
  BUG: Fix infinite recursion in str.format of flex arrays (Fixes #4359).

The implemention of __format__ on generic objects (PEP 3101) was changed to use string conversion when no better method is found.


  Commit: 76ecffaf443076c78424213d9e681bdfe5b3f409
      https://github.com/numpy/numpy/commit/76ecffaf443076c78424213d9e681bdfe5b3f409
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2014-03-01 (Sat, 01 Mar 2014)

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

  Log Message:
  -----------
  Merge pull request #4401 from meltingwax/meltingwax/4359

BUG: Fix infinite recursion in else case of __format__() implementation (fixes #4359)


Compare: https://github.com/numpy/numpy/compare/0dbd06f95d37...76ecffaf4430