comparison mercurial/wireproto.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

29215:f5983805574e

        for name, args, opts, resref in self.calls:
            mtd = getattr(self.remote, name)
            batchablefn = getattr(mtd, 'batchable', None)
            if batchablefn is not None:
                batchable = batchablefn(mtd.im_self, *args, **opts)
                encargsorres, encresref = batchable.next()
                if encresref:
                    req.append((name, encargsorres,))
                    rsp.append((batchable, encresref, resref,))
                else:
                    resref.set(encargsorres)

    def _submitreq(self, req, rsp):
        encresults = self.remote._submitbatch(req)
        for encres, r in zip(encresults, rsp):
            batchable, encresref, resref = r
            encresref.set(encres)
            resref.set(batchable.next())

class remoteiterbatcher(peer.iterbatcher):
    def __init__(self, remote):
        super(remoteiterbatcher, self).__init__()
        self._remote = remote

        """
        req, rsp = [], []
        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()
            assert encresref
            req.append((name, encargsorres))
            rsp.append((batchable, encresref))
        if req:
            self._resultiter = self._remote._submitbatch(req)

    def results(self):
        for (batchable, encresref), encres in itertools.izip(
                self._rsp, self._resultiter):
            encresref.set(encres)
            yield batchable.next()

# Forward a couple of names from peer to make wireproto interactions
# slightly more sensible.
batchable = peer.batchable
future = peer.future

29216:ead25aa27a43

        for name, args, opts, resref in self.calls:
            mtd = getattr(self.remote, name)
            batchablefn = getattr(mtd, 'batchable', None)
            if batchablefn is not None:
                batchable = batchablefn(mtd.im_self, *args, **opts)
                encargsorres, encresref = next(batchable)
                if encresref:
                    req.append((name, encargsorres,))
                    rsp.append((batchable, encresref, resref,))
                else:
                    resref.set(encargsorres)

    def _submitreq(self, req, rsp):
        encresults = self.remote._submitbatch(req)
        for encres, r in zip(encresults, rsp):
            batchable, encresref, resref = r
            encresref.set(encres)
            resref.set(next(batchable))

class remoteiterbatcher(peer.iterbatcher):
    def __init__(self, remote):
        super(remoteiterbatcher, self).__init__()
        self._remote = remote

        """
        req, rsp = [], []
        for name, args, opts, resref in self.calls:
            mtd = getattr(self._remote, name)
            batchable = mtd.batchable(mtd.im_self, *args, **opts)
            encargsorres, encresref = next(batchable)
            assert encresref
            req.append((name, encargsorres))
            rsp.append((batchable, encresref))
        if req:
            self._resultiter = self._remote._submitbatch(req)

    def results(self):
        for (batchable, encresref), encres in itertools.izip(
                self._rsp, self._resultiter):
            encresref.set(encres)
            yield next(batchable)

# Forward a couple of names from peer to make wireproto interactions
# slightly more sensible.
batchable = peer.batchable
future = peer.future