summaryrefslogtreecommitdiff
path: root/numpy/lib/arrayterator.py
diff options
context:
space:
mode:
authorEric Wieser <wieser.eric@gmail.com>2019-09-13 00:49:54 -0700
committerEric Wieser <wieser.eric@gmail.com>2019-09-13 00:49:54 -0700
commite4878891c848d0b1a46a310fd4a88fd7801b4fab (patch)
tree347007adf0c9dd4e4f4b4414106383a5c867b6ec /numpy/lib/arrayterator.py
parentb12a8690b6383e03573237b65fddd859afa1f282 (diff)
parent27d77ce2219d9e573a57159ce997e495b8aecbc5 (diff)
downloadnumpy-e4878891c848d0b1a46a310fd4a88fd7801b4fab.tar.gz
Merge tag 'branch-points/1.17.x' into HEAD
Diffstat (limited to 'numpy/lib/arrayterator.py')
-rw-r--r--numpy/lib/arrayterator.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/numpy/lib/arrayterator.py b/numpy/lib/arrayterator.py
index f2d4fe9fd..c16668582 100644
--- a/numpy/lib/arrayterator.py
+++ b/numpy/lib/arrayterator.py
@@ -80,9 +80,8 @@ class Arrayterator(object):
>>> for subarr in a_itor:
... if not subarr.all():
- ... print(subarr, subarr.shape)
- ...
- [[[[0 1]]]] (1, 1, 1, 2)
+ ... print(subarr, subarr.shape) # doctest: +SKIP
+ >>> # [[[[0 1]]]] (1, 1, 1, 2)
"""
@@ -160,7 +159,7 @@ class Arrayterator(object):
... if not subarr:
... print(subarr, type(subarr))
...
- 0 <type 'numpy.int32'>
+ 0 <class 'numpy.int64'>
"""
for block in self: