/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/workingtree.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/workingtree.py
1594
1594
        inventory_iterator = self._walkdirs(prefix)
1595
1595
        disk_iterator = osutils.walkdirs(disk_top, prefix)
1596
1596
        try:
1597
 
            current_disk = disk_iterator.next()
 
1597
            current_disk = next(disk_iterator)
1598
1598
            disk_finished = False
1599
1599
        except OSError as e:
1600
1600
            if not (e.errno == errno.ENOENT or
1603
1603
            current_disk = None
1604
1604
            disk_finished = True
1605
1605
        try:
1606
 
            current_inv = inventory_iterator.next()
 
1606
            current_inv = next(inventory_iterator)
1607
1607
            inv_finished = False
1608
1608
        except StopIteration:
1609
1609
            current_inv = None
1644
1644
                    cur_disk_dir_content]
1645
1645
                yield (cur_disk_dir_relpath, None), dirblock
1646
1646
                try:
1647
 
                    current_disk = disk_iterator.next()
 
1647
                    current_disk = next(disk_iterator)
1648
1648
                except StopIteration:
1649
1649
                    disk_finished = True
1650
1650
            elif direction < 0:
1654
1654
                    current_inv[1]]
1655
1655
                yield (current_inv[0][0], current_inv[0][1]), dirblock
1656
1656
                try:
1657
 
                    current_inv = inventory_iterator.next()
 
1657
                    current_inv = next(inventory_iterator)
1658
1658
                except StopIteration:
1659
1659
                    inv_finished = True
1660
1660
            else:
1686
1686
                        raise NotImplementedError('unreachable code')
1687
1687
                yield current_inv[0], dirblock
1688
1688
                try:
1689
 
                    current_inv = inventory_iterator.next()
 
1689
                    current_inv = next(inventory_iterator)
1690
1690
                except StopIteration:
1691
1691
                    inv_finished = True
1692
1692
                try:
1693
 
                    current_disk = disk_iterator.next()
 
1693
                    current_disk = next(disk_iterator)
1694
1694
                except StopIteration:
1695
1695
                    disk_finished = True
1696
1696
 
2073
2073
            return _mod_conflicts.ConflictList()
2074
2074
        try:
2075
2075
            try:
2076
 
                if confile.next() != CONFLICT_HEADER_1 + '\n':
 
2076
                if next(confile) != CONFLICT_HEADER_1 + '\n':
2077
2077
                    raise errors.ConflictFormatError()
2078
2078
            except StopIteration:
2079
2079
                raise errors.ConflictFormatError()
2370
2370
        try:
2371
2371
            merge_hashes = {}
2372
2372
            try:
2373
 
                if hashfile.next() != MERGE_MODIFIED_HEADER_1 + '\n':
 
2373
                if next(hashfile) != MERGE_MODIFIED_HEADER_1 + '\n':
2374
2374
                    raise errors.MergeModifiedFormatError()
2375
2375
            except StopIteration:
2376
2376
                raise errors.MergeModifiedFormatError()