summaryrefslogtreecommitdiff
path: root/numpy/lib/nanfunctions.py
diff options
context:
space:
mode:
authorJulian Taylor <juliantaylor108@gmail.com>2017-06-03 13:22:13 +0200
committerGitHub <noreply@github.com>2017-06-03 13:22:13 +0200
commit0e4610e30aabaf32c037fc94c869a20f2435a8f1 (patch)
tree5eae05250799d873fca5b8d1c0503ba1c204ff66 /numpy/lib/nanfunctions.py
parentecab1ff2b77b06e0fcbbfafd26d80aef486f74b8 (diff)
parentad1e3c118f378fd62883655a9a983dd0c682f968 (diff)
downloadnumpy-0e4610e30aabaf32c037fc94c869a20f2435a8f1.tar.gz
Merge pull request #9212 from eric-wieser/tidy-function_base
MAINT: Combine similar branches
Diffstat (limited to 'numpy/lib/nanfunctions.py')
-rw-r--r--numpy/lib/nanfunctions.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/numpy/lib/nanfunctions.py b/numpy/lib/nanfunctions.py
index 1e342b932..6bd949b34 100644
--- a/numpy/lib/nanfunctions.py
+++ b/numpy/lib/nanfunctions.py
@@ -1123,10 +1123,7 @@ def nanpercentile(a, q, axis=None, out=None, overwrite_input=False,
overwrite_input=overwrite_input,
interpolation=interpolation)
if keepdims and keepdims is not np._NoValue:
- if q.ndim == 0:
- return r.reshape(k)
- else:
- return r.reshape([len(q)] + k)
+ return r.reshape(q.shape + k)
else:
return r