summaryrefslogtreecommitdiff
path: root/numpy/lib/function_base.py
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/lib/function_base.py')
-rw-r--r--numpy/lib/function_base.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
index 8f08a73a4..163a129f7 100644
--- a/numpy/lib/function_base.py
+++ b/numpy/lib/function_base.py
@@ -422,7 +422,10 @@ def select(condlist, choicelist, default=0):
pfac = asarray(1)
for k in range(n2+1):
pfac = pfac + asarray(choicelist[k])
- S = S*ones(asarray(pfac).shape)
+ if type(S) in ScalarType:
+ S = S*ones(asarray(pfac).shape, type(S))
+ else:
+ S = S*ones(asarray(pfac).shape, S.dtype)
return choose(S, tuple(choicelist))
def _asarray1d(arr, copy=False):