Mercurial > hg
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
author | timeless <timeless@mozdev.org> |
---|---|
date | Mon, 16 May 2016 21:30:53 +0000 |
parents | 7996c3acc33b |
children | 0d83ad967bf8 |
comparison
equal
deleted
inserted
replaced
29215:f5983805574e | 29216:ead25aa27a43 |
---|---|
95 for name, args, opts, resref in self.calls: | 95 for name, args, opts, resref in self.calls: |
96 mtd = getattr(self.remote, name) | 96 mtd = getattr(self.remote, name) |
97 batchablefn = getattr(mtd, 'batchable', None) | 97 batchablefn = getattr(mtd, 'batchable', None) |
98 if batchablefn is not None: | 98 if batchablefn is not None: |
99 batchable = batchablefn(mtd.im_self, *args, **opts) | 99 batchable = batchablefn(mtd.im_self, *args, **opts) |
100 encargsorres, encresref = batchable.next() | 100 encargsorres, encresref = next(batchable) |
101 if encresref: | 101 if encresref: |
102 req.append((name, encargsorres,)) | 102 req.append((name, encargsorres,)) |
103 rsp.append((batchable, encresref, resref,)) | 103 rsp.append((batchable, encresref, resref,)) |
104 else: | 104 else: |
105 resref.set(encargsorres) | 105 resref.set(encargsorres) |
113 def _submitreq(self, req, rsp): | 113 def _submitreq(self, req, rsp): |
114 encresults = self.remote._submitbatch(req) | 114 encresults = self.remote._submitbatch(req) |
115 for encres, r in zip(encresults, rsp): | 115 for encres, r in zip(encresults, rsp): |
116 batchable, encresref, resref = r | 116 batchable, encresref, resref = r |
117 encresref.set(encres) | 117 encresref.set(encres) |
118 resref.set(batchable.next()) | 118 resref.set(next(batchable)) |
119 | 119 |
120 class remoteiterbatcher(peer.iterbatcher): | 120 class remoteiterbatcher(peer.iterbatcher): |
121 def __init__(self, remote): | 121 def __init__(self, remote): |
122 super(remoteiterbatcher, self).__init__() | 122 super(remoteiterbatcher, self).__init__() |
123 self._remote = remote | 123 self._remote = remote |
136 """ | 136 """ |
137 req, rsp = [], [] | 137 req, rsp = [], [] |
138 for name, args, opts, resref in self.calls: | 138 for name, args, opts, resref in self.calls: |
139 mtd = getattr(self._remote, name) | 139 mtd = getattr(self._remote, name) |
140 batchable = mtd.batchable(mtd.im_self, *args, **opts) | 140 batchable = mtd.batchable(mtd.im_self, *args, **opts) |
141 encargsorres, encresref = batchable.next() | 141 encargsorres, encresref = next(batchable) |
142 assert encresref | 142 assert encresref |
143 req.append((name, encargsorres)) | 143 req.append((name, encargsorres)) |
144 rsp.append((batchable, encresref)) | 144 rsp.append((batchable, encresref)) |
145 if req: | 145 if req: |
146 self._resultiter = self._remote._submitbatch(req) | 146 self._resultiter = self._remote._submitbatch(req) |
148 | 148 |
149 def results(self): | 149 def results(self): |
150 for (batchable, encresref), encres in itertools.izip( | 150 for (batchable, encresref), encres in itertools.izip( |
151 self._rsp, self._resultiter): | 151 self._rsp, self._resultiter): |
152 encresref.set(encres) | 152 encresref.set(encres) |
153 yield batchable.next() | 153 yield next(batchable) |
154 | 154 |
155 # Forward a couple of names from peer to make wireproto interactions | 155 # Forward a couple of names from peer to make wireproto interactions |
156 # slightly more sensible. | 156 # slightly more sensible. |
157 batchable = peer.batchable | 157 batchable = peer.batchable |
158 future = peer.future | 158 future = peer.future |