/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/transform.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/transform.py
305
305
            return self._r_new_id[file_id]
306
306
        else:
307
307
            try:
308
 
                self._tree.iter_entries_by_dir([file_id]).next()
 
308
                next(self._tree.iter_entries_by_dir([file_id]))
309
309
            except StopIteration:
310
310
                if file_id in self._non_present_ids:
311
311
                    return self._non_present_ids[file_id]
1138
1138
        :param records: An iterable of (names, content) tuples, as per
1139
1139
            pack.ContainerPushParser.
1140
1140
        """
1141
 
        names, content = records.next()
 
1141
        names, content = next(records)
1142
1142
        attribs = bencode.bdecode(content)
1143
1143
        self._id_number = attribs['_id_number']
1144
1144
        self._new_name = dict((k, v.decode('utf-8'))
2675
2675
                     in iter if not (c or e[0] != e[1])]
2676
2676
        if accelerator_tree.supports_content_filtering():
2677
2677
            unchanged = [(f, p) for (f, p) in unchanged
2678
 
                         if not accelerator_tree.iter_search_rules([p]).next()]
 
2678
                         if not next(accelerator_tree.iter_search_rules([p]))]
2679
2679
        unchanged = dict(unchanged)
2680
2680
        new_desired_files = []
2681
2681
        count = 0
3091
3091
                        file_id = tt.final_file_id(trans_id)
3092
3092
                        if file_id is None:
3093
3093
                            file_id = tt.inactive_file_id(trans_id)
3094
 
                        _, entry = path_tree.iter_entries_by_dir(
3095
 
                            [file_id]).next()
 
3094
                        _, entry = next(path_tree.iter_entries_by_dir(
 
3095
                            [file_id]))
3096
3096
                        # special-case the other tree root (move its
3097
3097
                        # children to current root)
3098
3098
                        if entry.parent_id is None: