summaryrefslogtreecommitdiff
path: root/numpy/lib/stride_tricks.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2018-08-31 13:44:59 -0500
committerGitHub <noreply@github.com>2018-08-31 13:44:59 -0500
commit866589cdf7ecb3054ec3ae6493612d51c9d5e56d (patch)
treea37f31bc41dc8c67530a823391b96f058fe9c26c /numpy/lib/stride_tricks.py
parent089a0e0e9d1e32f57ddb89be5f450125bc58f57f (diff)
parentf17f229a4a5def56282df4a7e51461c9374385d8 (diff)
downloadnumpy-866589cdf7ecb3054ec3ae6493612d51c9d5e56d.tar.gz
Merge branch 'master' into warn-float16-nan
Diffstat (limited to 'numpy/lib/stride_tricks.py')
-rw-r--r--numpy/lib/stride_tricks.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/lib/stride_tricks.py b/numpy/lib/stride_tricks.py
index bc5993802..ca13738c1 100644
--- a/numpy/lib/stride_tricks.py
+++ b/numpy/lib/stride_tricks.py
@@ -242,7 +242,7 @@ def broadcast_arrays(*args, **kwargs):
subok = kwargs.pop('subok', False)
if kwargs:
raise TypeError('broadcast_arrays() got an unexpected keyword '
- 'argument {!r}'.format(kwargs.keys()[0]))
+ 'argument {!r}'.format(list(kwargs.keys())[0]))
args = [np.array(_m, copy=False, subok=subok) for _m in args]
shape = _broadcast_shape(*args)