[Numpy-svn] [numpy/numpy] e6807b: BUG: Fix advanced object non-array value assignmen...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/numpy/numpy
  Commit: e6807bed9d74d8962c7c0b20054edaf33169b1ae
      https://github.com/numpy/numpy/commit/e6807bed9d74d8962c7c0b20054edaf33169b1ae
  Author: Sebastian Berg <sebastian at sipsolutions.net>
  Date:   2015-03-26 (Thu, 26 Mar 2015)

  Changed paths:
    M numpy/core/src/multiarray/mapping.c
    M numpy/core/tests/test_indexing.py

  Log Message:
  -----------
  BUG: Fix advanced object non-array value assignment

If the value array in an advanced indexing assignment was a non-array
and the array being assigned to is an object array, a temporary
array is created to make the object assignment work well like
slicing in general.
However, this array was created with the swapping of the mapiter
object. So we have to swap it back as if it was an array being
subscripted with MapIterSwapAxes.


  Commit: 1f6e7cc470c6d5af23b2467863f42108e6c5f545
      https://github.com/numpy/numpy/commit/1f6e7cc470c6d5af23b2467863f42108e6c5f545
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2015-03-26 (Thu, 26 Mar 2015)

  Changed paths:
    M numpy/core/src/multiarray/mapping.c
    M numpy/core/tests/test_indexing.py

  Log Message:
  -----------
  Merge pull request #5714 from seberg/fancy-object-assign

BUG: Fix advanced object non-array value assignment


Compare: https://github.com/numpy/numpy/compare/e3101647ef7c...1f6e7cc470c6