summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Taylor <juliantaylor108@gmail.com>2017-02-06 12:22:36 +0100
committerGitHub <noreply@github.com>2017-02-06 12:22:36 +0100
commitca248b72589c39e3138e8bd7b658c1bd5dca209a (patch)
treebb4b2e06386318a3fee08567f05efdbc3e90a8ba
parent72839c43f2536c65bc4fbf6db5ae8ebb1c29c674 (diff)
parent6bb3fc4e51633104f93bdc5f647058dcf4cf5f68 (diff)
downloadnumpy-ca248b72589c39e3138e8bd7b658c1bd5dca209a.tar.gz
Merge pull request #8572 from juliantaylor/cleanup
MAINT: remove ma out= workaround
-rw-r--r--numpy/ma/extras.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/numpy/ma/extras.py b/numpy/ma/extras.py
index 0a60ea331..29a15633d 100644
--- a/numpy/ma/extras.py
+++ b/numpy/ma/extras.py
@@ -729,10 +729,6 @@ def _median(a, axis=None, out=None, overwrite_input=False):
s = mid.sum(out=out)
if not odd:
s = np.true_divide(s, 2., casting='safe', out=out)
- # masked ufuncs do not fullfill `returned is out` (gh-8416)
- # fix this to return the same in the nd path
- if out is not None:
- s = out
s = np.lib.utils._median_nancheck(asorted, s, axis, out)
else:
s = mid.mean(out=out)