Merge pull request #2134 from bfroehle/2to3_next

Apply 2to3 `next` fix.

IPython/core/completer.py

@@ -718,10 +718,10 b' class IPCompleter(Completer):'
         isId = re.compile(r'\w+$').match
         while True:
             try:
-                ids.append(iterTokens.next())
+                ids.append(next(iterTokens))
                 if not isId(ids[-1]):
                     ids.pop(); break
-                if not iterTokens.next() == '.':
+                if not next(iterTokens) == '.':
                     break
             except StopIteration:
                 break

IPython/external/pexpect/_pexpect.py

@@ -930,7 +930,7 b' class spawnb(object):'
 
         return self
 
-    def next (self):    # File-like object.
+    def __next__ (self):    # File-like object.
 
         """This is to support iterators over a file-like object.
         """
@@ -940,6 +940,9 b' class spawnb(object):'
             raise StopIteration
         return result
 
+    if not PY3:
+        next = __next__    # File-like object.
+
     def readlines (self, sizehint = -1):    # File-like object.
 
         """This reads until EOF using readline() and returns a list containing

IPython/frontend/qt/console/pygments_highlighter.py

@@ -174,7 +174,7 b' class PygmentsHighlighter(QtGui.QSyntaxHighlighter):'
     def _get_format_from_document(self, token, document):
         """ Returns a QTextCharFormat for token by
         """
-        code, html = self._formatter._format_lines([(token, u'dummy')]).next()
+        code, html = next(self._formatter._format_lines([(token, u'dummy')]))
         self._document.setHtml(html)
         return QtGui.QTextCursor(self._document).charFormat()
 

IPython/testing/_paramtestpy2.py

@@ -51,7 +51,7 b' class ParametricTestCase(unittest.TestCase):'
                 # Test execution
                 ok = False
                 try:
-                    testgen.next()
+                    next(testgen)
                     ok = True
                 except StopIteration:
                     # We stop the loop

IPython/utils/_process_common.py

@@ -179,7 +179,7 b' def arg_split(s, posix=False, strict=True):'
     tokens = []
     while True:
         try:
-            tokens.append(lex.next())
+            tokens.append(next(lex))
         except StopIteration:
             break
         except ValueError:

IPython/zmq/iostream.py

@@ -5,6 +5,7 b' from io import StringIO'
 from session import extract_header, Message
 
 from IPython.utils import io, text, encoding
+from IPython.utils import py3compat
 
 #-----------------------------------------------------------------------------
 # Globals
@@ -54,9 +55,12 b' class OutStream(object):'
     def isatty(self):
         return False
 
-    def next(self):
+    def __next__(self):
         raise IOError('Read not supported on a write only stream.')
 
+    if not py3compat.PY3:
+        next = __next__
+
     def read(self, size=-1):
         raise IOError('Read not supported on a write only stream.')
 

setup.py

@@ -272,6 +272,7 b" if 'setuptools' in sys.modules:"
                 'lib2to3.fixes.fix_except',
                 'lib2to3.fixes.fix_apply',
                 'lib2to3.fixes.fix_repr',
+                'lib2to3.fixes.fix_next',
                 ]
         from setuptools.command.build_py import build_py
         setup_args['cmdclass'] = {'build_py': record_commit_info('IPython', build_cmd=build_py)}