--- a/mercurial/wireproto.py Mon May 16 21:30:32 2016 +0000
+++ b/mercurial/wireproto.py Mon May 16 21:30:53 2016 +0000
@@ -97,7 +97,7 @@
batchablefn = getattr(mtd, 'batchable', None)
if batchablefn is not None:
batchable = batchablefn(mtd.im_self, *args, **opts)
- encargsorres, encresref = batchable.next()
+ encargsorres, encresref = next(batchable)
if encresref:
req.append((name, encargsorres,))
rsp.append((batchable, encresref, resref,))
@@ -115,7 +115,7 @@
for encres, r in zip(encresults, rsp):
batchable, encresref, resref = r
encresref.set(encres)
- resref.set(batchable.next())
+ resref.set(next(batchable))
class remoteiterbatcher(peer.iterbatcher):
def __init__(self, remote):
@@ -138,7 +138,7 @@
for name, args, opts, resref in self.calls:
mtd = getattr(self._remote, name)
batchable = mtd.batchable(mtd.im_self, *args, **opts)
- encargsorres, encresref = batchable.next()
+ encargsorres, encresref = next(batchable)
assert encresref
req.append((name, encargsorres))
rsp.append((batchable, encresref))
@@ -150,7 +150,7 @@
for (batchable, encresref), encres in itertools.izip(
self._rsp, self._resultiter):
encresref.set(encres)
- yield batchable.next()
+ yield next(batchable)
# Forward a couple of names from peer to make wireproto interactions
# slightly more sensible.