Merge pull request numpy#15887 from mwtoews/next

MAINT: Clean-up 'next = __next__' used for Python 2 compatibility
merraksh · Apr 1, 2020 · 9ccb42d · 9ccb42d
2 parents 3310cd0 + 30f8391
commit 9ccb42d
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 12 deletions.
diff --git a/numpy/lib/index_tricks.py b/numpy/lib/index_tricks.py
@@ -597,8 +597,6 @@ def __next__(self):
     def __iter__(self):
         return self
 
-    next = __next__
-
 
 @set_module('numpy')
 class ndindex:
@@ -665,8 +663,6 @@ def __next__(self):
         next(self._it)
         return self._it.multi_index
 
-    next = __next__
-
 
 # You can do all this with slice() plus a few special objects,
 # but there's a lot to remember. This version is simpler because

diff --git a/numpy/linalg/lapack_lite/fortran.py b/numpy/linalg/lapack_lite/fortran.py
@@ -44,8 +44,6 @@ def __next__(self):
         line = line.rstrip()
         return line
 
-    next = __next__
-
 
 class PushbackIterator:
     """PushbackIterator(iterable)
@@ -71,8 +69,6 @@ def __next__(self):
     def pushback(self, item):
         self.buffer.append(item)
 
-    next = __next__
-
 
 def fortranSourceLines(fo):
     """Return an iterator over statement lines of a Fortran source file.

diff --git a/numpy/ma/core.py b/numpy/ma/core.py
@@ -2699,8 +2699,6 @@ def __next__(self):
                 return masked
         return d
 
-    next = __next__
-
 
 class MaskedArray(ndarray):
     """

diff --git a/numpy/ma/tests/test_subclassing.py b/numpy/ma/tests/test_subclassing.py
@@ -105,8 +105,6 @@ def __setitem__(self, index, value):
     def __next__(self):
         return next(self._dataiter).__array__().view(type(self._original))
 
-    next = __next__
-
 
 class ComplicatedSubArray(SubArray):