/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/multiparent.py

  • Committer: Breezy landing bot
  • Author(s): Martin
  • Date: 2017-05-26 09:35:13 UTC
  • mfrom: (6634.2.2 next_up_next)
  • Revision ID: breezy.the.bot@gmail.com-20170526093513-funr1gww70uc4mag
Make iterator objects and use of next Python 3 compatible

Merged from https://code.launchpad.net/~gz/brz/next_up_next/+merge/324586

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/multiparent.py
117
117
        diff = MultiParent([])
118
118
        def next_block(p):
119
119
            try:
120
 
                return block_iter[p].next()
 
120
                return next(block_iter[p])
121
121
            except StopIteration:
122
122
                return None
123
123
        cur_block = [next_block(p) for p, i in enumerate(block_iter)]
203
203
        cur_line = None
204
204
        while(True):
205
205
            try:
206
 
                cur_line = line_iter.next()
 
206
                cur_line = next(line_iter)
207
207
            except StopIteration:
208
208
                break
209
209
            if cur_line[0] == 'i':
210
210
                num_lines = int(cur_line.split(' ')[1])
211
 
                hunk_lines = [line_iter.next() for x in xrange(num_lines)]
 
211
                hunk_lines = [next(line_iter) for x in xrange(num_lines)]
212
212
                hunk_lines[-1] = hunk_lines[-1][:-1]
213
213
                hunks.append(NewText(hunk_lines))
214
214
            elif cur_line[0] == '\n':
646
646
                start, end, kind, data, iterator = self.cursor[req_version_id]
647
647
            except KeyError:
648
648
                iterator = self.diffs.get_diff(req_version_id).range_iterator()
649
 
                start, end, kind, data = iterator.next()
 
649
                start, end, kind, data = next(iterator)
650
650
            if start > req_start:
651
651
                iterator = self.diffs.get_diff(req_version_id).range_iterator()
652
 
                start, end, kind, data = iterator.next()
 
652
                start, end, kind, data = next(iterator)
653
653
 
654
654
            # find the first hunk relevant to the request
655
655
            while end <= req_start:
656
 
                start, end, kind, data = iterator.next()
 
656
                start, end, kind, data = next(iterator)
657
657
            self.cursor[req_version_id] = start, end, kind, data, iterator
658
658
            # if the hunk can't satisfy the whole request, split it in two,
659
659
            # and leave the second half for later.