summaryrefslogtreecommitdiff
path: root/numpy/lib/shape_base.py
diff options
context:
space:
mode:
authorStephan Hoyer <shoyer@google.com>2018-11-10 16:12:18 -0800
committerStephan Hoyer <shoyer@google.com>2018-11-10 16:12:18 -0800
commitb44284ebc42c496e5c5d906acc33ebbc337fd3b1 (patch)
tree52322a497bc9c0def2065c48ce0c00e8eee750a3 /numpy/lib/shape_base.py
parent56ce2327462eb9e3980c568ce9be628892aad89f (diff)
downloadnumpy-b44284ebc42c496e5c5d906acc33ebbc337fd3b1.tar.gz
MAINT: more fixes for disabling overrides
Diffstat (limited to 'numpy/lib/shape_base.py')
-rw-r--r--numpy/lib/shape_base.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/numpy/lib/shape_base.py b/numpy/lib/shape_base.py
index 6e7cab3fa..f56c4f4db 100644
--- a/numpy/lib/shape_base.py
+++ b/numpy/lib/shape_base.py
@@ -11,7 +11,8 @@ from numpy.core.fromnumeric import product, reshape, transpose
from numpy.core.multiarray import normalize_axis_index
from numpy.core import overrides
from numpy.core import vstack, atleast_3d
-from numpy.core.shape_base import _arrays_for_stack_dispatcher
+from numpy.core.shape_base import (
+ _arrays_for_stack_dispatcher, _warn_for_nonsequence)
from numpy.lib.index_tricks import ndindex
from numpy.matrixlib.defmatrix import matrix # this raises all the right alarm bells
@@ -629,6 +630,7 @@ def column_stack(tup):
[3, 4]])
"""
+ _warn_for_nonsequence(tup)
arrays = []
for v in tup:
arr = array(v, copy=False, subok=True)
@@ -693,6 +695,7 @@ def dstack(tup):
[[3, 4]]])
"""
+ _warn_for_nonsequence(tup)
return _nx.concatenate([atleast_3d(_m) for _m in tup], 2)