/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/repofmt/knitpack_repo.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-30 19:32:13 UTC
  • mfrom: (6637 work)
  • mto: This revision was merged to the branch mainline in revision 6639.
  • Revision ID: jelmer@jelmer.uk-20170530193213-qm21s6dc7dln237t
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/repofmt/knitpack_repo.py
20
20
 
21
21
from ..lazy_import import lazy_import
22
22
lazy_import(globals(), """
23
 
from itertools import izip
24
23
import time
25
24
 
26
25
from breezy import (
68
67
    PackRootCommitBuilder,
69
68
    RepositoryPackCollection,
70
69
    )
 
70
from ..sixish import (
 
71
    zip
 
72
    )
71
73
from ..vf_repository import (
72
74
    StreamSource,
73
75
    )
659
661
                if self._reload_func is not None:
660
662
                    self._reload_func()
661
663
                raise
662
 
            for (names, read_func), (_1, _2, (key, eol_flag)) in \
663
 
                izip(reader.iter_records(), pack_readv_requests):
 
664
            for (names, read_func), (_1, _2, (key, eol_flag)) in zip(
 
665
                    reader.iter_records(), pack_readv_requests):
664
666
                raw_data = read_func(None)
665
667
                # check the header only
666
668
                if output_lines is not None:
711
713
                if self._reload_func is not None:
712
714
                    self._reload_func()
713
715
                raise
714
 
            for (names, read_func), (key, eol_flag, references) in \
715
 
                izip(reader.iter_records(), node_vector):
 
716
            for (names, read_func), (key, eol_flag, references) in zip(
 
717
                    reader.iter_records(), node_vector):
716
718
                raw_data = read_func(None)
717
719
                if output_lines:
718
720
                    # read the entire thing