Feb 9, 2018 · Jan 26, 2018 · Feb 9, 2018
diff --git a/numpy/ma/core.py b/numpy/ma/core.py

        if context is not None:
            result._mask = result._mask.copy()
            (func, args, _) = context
            m = reduce(mask_or, [getmaskarray(arg) for arg in args])
            func, args, out_i = context
            # args sometimes contains outputs (gh-10459), which we don't want
            input_args = args[:func.nin]
            m = reduce(mask_or, [getmaskarray(arg) for arg in input_args])
            # Get the domain mask
            domain = ufunc_domain.get(func, None)
            if domain is not None:
                # Take the domain, and make sure it's a ndarray
                if len(args) > 2:
                if len(input_args) > 2:
                    with np.errstate(divide='ignore', invalid='ignore'):
                        d = filled(reduce(domain,args), True)
                        d = filled(reduce(domain,input_args), True)
                else:
                    with np.errstate(divide='ignore', invalid='ignore'):
                        d = filled(domain(*args), True)
                        d = filled(domain(*input_args), True)

                if d.any():
                    # Fill the result where the domain is wrong
diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py
    y = np.add(x, 1., out=x)
    assert_(y is x)


 def test_ufunc_with_out_varied():
    """ Test that masked arrays are immune to gh-10459 """
    # the mask of the output should not affect the result, however it is passed
    a        = array([ 1,  2,  3], mask=[1, 0, 0])
    b        = array([10, 20, 30], mask=[1, 0, 0])
    out      = array([ 0,  0,  0], mask=[0, 0, 1])
    expected = array([11, 22, 33], mask=[1, 0, 0])

    out_pos = out.copy()
    res_pos = np.add(a, b, out_pos)

    out_kw = out.copy()
    res_kw = np.add(a, b, out=out_kw)

    out_tup = out.copy()
    res_tup = np.add(a, b, out=(out_tup,))

    assert_equal(res_kw.mask,  expected.mask)
    assert_equal(res_kw.data,  expected.data)
    assert_equal(res_tup.mask, expected.mask)
    assert_equal(res_tup.data, expected.data)
    assert_equal(res_pos.mask, expected.mask)
    assert_equal(res_pos.data, expected.data)


 def test_astype():
    descr = [('v', int, 3), ('x', [('y', float)])]
    x = array(([1, 2, 3], (1.0,)), dtype=descr)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3010,18 +3010,20 @@ def __array_wrap__(self, obj, context=None):

		if context is not None:
		result._mask = result._mask.copy()
		(func, args, _) = context
		m = reduce(mask_or, [getmaskarray(arg) for arg in args])
		func, args, out_i = context
		# args sometimes contains outputs (gh-10459), which we don't want
		input_args = args[:func.nin]
		m = reduce(mask_or, [getmaskarray(arg) for arg in input_args])
		# Get the domain mask
		domain = ufunc_domain.get(func, None)
		if domain is not None:
		# Take the domain, and make sure it's a ndarray
		if len(args) > 2:
		if len(input_args) > 2:
		with np.errstate(divide='ignore', invalid='ignore'):
		d = filled(reduce(domain,args), True)
		d = filled(reduce(domain,input_args), True)
		else:
		with np.errstate(divide='ignore', invalid='ignore'):
		d = filled(domain(*args), True)
		d = filled(domain(*input_args), True)

		if d.any():
		# Fill the result where the domain is wrong
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5052,6 +5052,32 @@ def test_ufunc_with_output():
		y = np.add(x, 1., out=x)
		assert_(y is x)


		def test_ufunc_with_out_varied():
		""" Test that masked arrays are immune to gh-10459 """
		# the mask of the output should not affect the result, however it is passed
		a = array([ 1, 2, 3], mask=[1, 0, 0])
		b = array([10, 20, 30], mask=[1, 0, 0])
		out = array([ 0, 0, 0], mask=[0, 0, 1])
		expected = array([11, 22, 33], mask=[1, 0, 0])

		out_pos = out.copy()
		res_pos = np.add(a, b, out_pos)

		out_kw = out.copy()
		res_kw = np.add(a, b, out=out_kw)

		out_tup = out.copy()
		res_tup = np.add(a, b, out=(out_tup,))

		assert_equal(res_kw.mask, expected.mask)
		assert_equal(res_kw.data, expected.data)
		assert_equal(res_tup.mask, expected.mask)
		assert_equal(res_tup.data, expected.data)
		assert_equal(res_pos.mask, expected.mask)
		assert_equal(res_pos.data, expected.data)


		def test_astype():
		descr = [('v', int, 3), ('x', [('y', float)])]
		x = array(([1, 2, 3], (1.0,)), dtype=descr)
Expand Down