/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/btree_index.py

  • Committer: Martin
  • Date: 2017-05-25 01:35:55 UTC
  • mto: This revision was merged to the branch mainline in revision 6637.
  • Revision ID: gzlist@googlemail.com-20170525013555-lepzczdnzb9r272j
Apply 2to3 next fixer and make compatible

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/btree_index.py
266
266
        current_values = []
267
267
        for iterator in iterators_to_combine:
268
268
            try:
269
 
                current_values.append(iterator.next())
 
269
                current_values.append(next(iterator))
270
270
            except StopIteration:
271
271
                current_values.append(None)
272
272
        last = None
286
286
            yield (self,) + selected[1][1:]
287
287
            pos = selected[0]
288
288
            try:
289
 
                current_values[pos] = iterators_to_combine[pos].next()
 
289
                current_values[pos] = next(iterators_to_combine[pos])
290
290
            except StopIteration:
291
291
                current_values[pos] = None
292
292
 
577
577
                while dicts:
578
578
                    key_dict = dicts.pop(-1)
579
579
                    # can't be empty or would not exist
580
 
                    item, value = key_dict.iteritems().next()
 
580
                    item, value = next(key_dict.iteritems())
581
581
                    if isinstance(value, dict):
582
582
                        # push keys
583
583
                        dicts.extend(key_dict.itervalues())
1072
1072
        #     return [(o, offsets[o]) for o in sorted(offsets)]
1073
1073
        in_keys_iter = iter(in_keys)
1074
1074
        fixed_keys_iter = enumerate(fixed_keys)
1075
 
        cur_in_key = in_keys_iter.next()
1076
 
        cur_fixed_offset, cur_fixed_key = fixed_keys_iter.next()
 
1075
        cur_in_key = next(in_keys_iter)
 
1076
        cur_fixed_offset, cur_fixed_key = next(fixed_keys_iter)
1077
1077
 
1078
1078
        class InputDone(Exception): pass
1079
1079
        class FixedDone(Exception): pass
1095
1095
                    while cur_in_key < cur_fixed_key:
1096
1096
                        cur_keys.append(cur_in_key)
1097
1097
                        try:
1098
 
                            cur_in_key = in_keys_iter.next()
 
1098
                            cur_in_key = next(in_keys_iter)
1099
1099
                        except StopIteration:
1100
1100
                            raise InputDone
1101
1101
                    # At this point cur_in_key must be >= cur_fixed_key
1103
1103
                # the end
1104
1104
                while cur_in_key >= cur_fixed_key:
1105
1105
                    try:
1106
 
                        cur_fixed_offset, cur_fixed_key = fixed_keys_iter.next()
 
1106
                        cur_fixed_offset, cur_fixed_key = next(fixed_keys_iter)
1107
1107
                    except StopIteration:
1108
1108
                        raise FixedDone
1109
1109
        except InputDone:
1431
1431
                while dicts:
1432
1432
                    key_dict = dicts.pop(-1)
1433
1433
                    # can't be empty or would not exist
1434
 
                    item, value = key_dict.iteritems().next()
 
1434
                    item, value = next(key_dict.iteritems())
1435
1435
                    if isinstance(value, dict):
1436
1436
                        # push keys
1437
1437
                        dicts.extend(key_dict.itervalues())