/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/tests/test_knit.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-08 23:30:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170608233031-3qavls2o7a1pqllj
Update imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_knit.py
21
21
 
22
22
from .. import (
23
23
    errors,
24
 
    knit,
25
24
    multiparent,
26
25
    osutils,
27
 
    pack,
28
26
    tests,
29
27
    transport,
30
28
    )
 
29
from ..bzr import (
 
30
    knit,
 
31
    pack,
 
32
    )
31
33
from ..errors import (
32
34
    KnitHeaderError,
33
35
    NoSuchFile,
34
36
    )
35
 
from ..index import *
36
 
from ..knit import (
 
37
from ..bzr.index import *
 
38
from ..bzr.knit import (
37
39
    AnnotatedKnitContent,
38
40
    KnitContent,
39
41
    KnitVersionedFiles,
58
60
    TestCaseWithTransport,
59
61
    TestNotApplicable,
60
62
    )
61
 
from ..versionedfile import (
 
63
from ..bzr.versionedfile import (
62
64
    AbsentContentFactory,
63
65
    ConstantMapper,
64
66
    network_bytes_to_kind_and_offset,
70
72
 
71
73
 
72
74
compiled_knit_feature = features.ModuleAvailableFeature(
73
 
    'breezy._knit_load_data_pyx')
 
75
    'breezy.bzr._knit_load_data_pyx')
74
76
 
75
77
 
76
78
class KnitContentTestsMixin(object):
893
895
 
894
896
    def get_knit_index(self, transport, name, mode):
895
897
        mapper = ConstantMapper(name)
896
 
        from breezy._knit_load_data_py import _load_data_py
 
898
        from ._knit_load_data_py import _load_data_py
897
899
        self.overrideAttr(knit, '_load_data', _load_data_py)
898
900
        allow_writes = lambda: 'w' in mode
899
901
        return _KndxIndex(transport, mapper, lambda:None, allow_writes, lambda:True)
1324
1326
 
1325
1327
    def get_knit_index(self, transport, name, mode):
1326
1328
        mapper = ConstantMapper(name)
1327
 
        from breezy._knit_load_data_pyx import _load_data_c
 
1329
        from ._knit_load_data_pyx import _load_data_c
1328
1330
        self.overrideAttr(knit, '_load_data', _load_data_c)
1329
1331
        allow_writes = lambda: mode == 'w'
1330
1332
        return _KndxIndex(transport, mapper, lambda:None,