Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 29216:ead25aa27a43
py3: convert to next() function
next(..) was introduced in py2.6 and .next() is not available in py3
https://docs.python.org/2/library/functions.html#next
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Mon, 16 May 2016 21:30:53 +0000 |
| parents | 899879becd65 |
| children | 4d075bf28702 |
line wrap: on
line diff
--- a/mercurial/merge.py Mon May 16 21:30:32 2016 +0000 +++ b/mercurial/merge.py Mon May 16 21:30:53 2016 +0000 @@ -373,7 +373,7 @@ """Write current state on disk in a version 1 file""" f = self._repo.vfs(self.statepathv1, 'w') irecords = iter(records) - lrecords = irecords.next() + lrecords = next(irecords) assert lrecords[0] == 'L' f.write(hex(self._local) + '\n') for rtype, data in irecords: