summaryrefslogtreecommitdiff
path: root/numpy/lib
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2015-06-24 23:04:13 -0400
committerCharles Harris <charlesr.harris@gmail.com>2015-06-24 23:04:13 -0400
commit086f51ebaa70e98dbca26e90f8d28a4ea57d655f (patch)
treef2de1f207bfc50015a3b10f075bda1604caaa8e3 /numpy/lib
parent75190503dd569e58029cdac81e6451907181c130 (diff)
parente552922fe6c8854541337a10970ff1b62caffc70 (diff)
downloadnumpy-086f51ebaa70e98dbca26e90f8d28a4ea57d655f.tar.gz
Merge pull request #6017 from njsmith/raise-stopiteration-deprecated
MAINT: remove use of 'raise StopIteration' from generators
Diffstat (limited to 'numpy/lib')
-rw-r--r--numpy/lib/arrayterator.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/lib/arrayterator.py b/numpy/lib/arrayterator.py
index d9839feeb..4aa977c46 100644
--- a/numpy/lib/arrayterator.py
+++ b/numpy/lib/arrayterator.py
@@ -182,7 +182,7 @@ class Arrayterator(object):
def __iter__(self):
# Skip arrays with degenerate dimensions
if [dim for dim in self.shape if dim <= 0]:
- raise StopIteration
+ return
start = self.start[:]
stop = self.stop[:]
@@ -223,4 +223,4 @@ class Arrayterator(object):
start[i] = self.start[i]
start[i-1] += self.step[i-1]
if start[0] >= self.stop[0]:
- raise StopIteration
+ return