summaryrefslogtreecommitdiff
path: root/numpy/lib/index_tricks.py
diff options
context:
space:
mode:
authorEric Wieser <wieser.eric@gmail.com>2017-03-22 22:56:21 +0000
committerEric Wieser <wieser.eric@gmail.com>2017-05-05 21:45:48 +0100
commitb2006cb2a7fe508bca8aa7039352731634869334 (patch)
tree625dbf0e21ace0f739089b48b5cddc6b1b8d1b87 /numpy/lib/index_tricks.py
parentd6069fb19107300e59ba57093cb87e44fa39599f (diff)
downloadnumpy-b2006cb2a7fe508bca8aa7039352731634869334.tar.gz
BUG: np.r_['r',...] crashes on scalars
Diffstat (limited to 'numpy/lib/index_tricks.py')
-rw-r--r--numpy/lib/index_tricks.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/lib/index_tricks.py b/numpy/lib/index_tricks.py
index 8777de485..cece2b868 100644
--- a/numpy/lib/index_tricks.py
+++ b/numpy/lib/index_tricks.py
@@ -308,7 +308,7 @@ class AxisConcatenator(object):
raise ValueError("unknown special directive")
elif type(item) in ScalarType:
newobj = array(item, ndmin=ndmin)
- scalars.append(k)
+ scalars.append(len(objs))
scalar = True
scalartypes.append(newobj.dtype)
else: