/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/groupcompress.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/groupcompress.py
1170
1170
                if memos_to_get_stack and memos_to_get_stack[-1] == read_memo:
1171
1171
                    # The next block from _get_blocks will be the block we
1172
1172
                    # need.
1173
 
                    block_read_memo, block = blocks.next()
 
1173
                    block_read_memo, block = next(blocks)
1174
1174
                    if block_read_memo != read_memo:
1175
1175
                        raise AssertionError(
1176
1176
                            "block_read_memo out of sync with read_memo"
1412
1412
                yield read_memo, cached[read_memo]
1413
1413
            except KeyError:
1414
1414
                # Read the block, and cache it.
1415
 
                zdata = raw_records.next()
 
1415
                zdata = next(raw_records)
1416
1416
                block = GroupCompressBlock.from_bytes(zdata)
1417
1417
                self._group_cache[read_memo] = block
1418
1418
                cached[read_memo] = block