[Numpy-svn] [numpy/numpy] 25de8c: [fix] Check for errors in PyArray_CanCastTypeto DE...

[GitHub]

  Branch: refs/heads/maintenance/1.7.x
  Home:   https://github.com/numpy/numpy
  Commit: 25de8c5d3cff5ba990ff9b47205c74a93fcb14e0
      https://github.com/numpy/numpy/commit/25de8c5d3cff5ba990ff9b47205c74a93fcb14e0
  Author: Nathaniel J. Smith <njs at pobox.com>
  Date:   2013-09-27 (Fri, 27 Sep 2013)

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

  Log Message:
  -----------
  [fix] Check for errors in PyArray_CanCastTypeto DEPRECATE

If a user had set warnings to raise errors, then this DEPRECATE would
leave us with an unpropagated exception and cause havoc downstream.

Unfortunately there is no way to propagate an exception from here, so
we just have to throw it away :-(. But this is still better than the
alternative...

Conflicts:
	numpy/core/tests/test_ufunc.py


  Commit: 52caf48a1940772b8baeca8d90a41bc7e0a43901
      https://github.com/numpy/numpy/commit/52caf48a1940772b8baeca8d90a41bc7e0a43901
  Author: Nathaniel J. Smith <njs at pobox.com>
  Date:   2013-09-27 (Fri, 27 Sep 2013)

  Changed paths:
    M numpy/core/src/multiarray/convert_datatype.c
    M numpy/core/tests/test_ufunc.py

  Log Message:
  -----------
  [fix] If we fail to raise an error, at least dump something to the console

Conflicts:
	numpy/core/tests/test_ufunc.py


  Commit: 5b5e01b97d083035098c8d4292ddc97f30659ac5
      https://github.com/numpy/numpy/commit/5b5e01b97d083035098c8d4292ddc97f30659ac5
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2013-09-27 (Fri, 27 Sep 2013)

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

  Log Message:
  -----------
  BUG: Do not use python with statement.

The python with statement is not available in Python 2.4, 2.5.


  Commit: c0dc623d29af320c57b744420e935d4f230c56e7
      https://github.com/numpy/numpy/commit/c0dc623d29af320c57b744420e935d4f230c56e7
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2013-09-27 (Fri, 27 Sep 2013)

  Changed paths:
    M numpy/core/src/multiarray/convert_datatype.c
    M numpy/core/tests/test_ufunc.py

  Log Message:
  -----------
  Merge pull request #3813 from charris/backport-1.7-3806

Backport 1.7 3806


Compare: https://github.com/numpy/numpy/compare/1ab56d2d6c59...c0dc623d29af