diff -r c69f4f7fe01a -r d647f97f88dd mercurial/parser.py
--- a/mercurial/parser.py	Mon May 18 12:22:44 2015 -0500
+++ b/mercurial/parser.py	Mon May 18 12:27:15 2015 -0500
@@ -27,10 +27,7 @@
     def _advance(self):
         'advance the tokenizer'
         t = self.current
-        try:
-            self.current = self._iter.next()
-        except StopIteration:
-            pass
+        self.current = next(self._iter, None)
         return t
     def _match(self, m, pos):
         'make sure the tokenizer matches an end condition'