← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_import_tariff.py

  • Committer: Vincent Ladeuil
  • Date: 2012-03-08 18:30:33 UTC
  • mfrom: (6487 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6488.
  • Revision ID: v.ladeuil+lp@free.fr-20120308183033-bccqnbr1tpozs711
Merge bzr.dev resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_import_tariff.py
25
25
    plugins as _mod_plugins,
26
26
    trace,
27
27
    )
28
 
from bzrlib.bzrdir import BzrDir
 
28
from bzrlib.controldir import ControlDir
29
29
from bzrlib.smart import medium
30
30
from bzrlib.transport import remote
31
31
 
223
223
        client_medium = medium.SmartSimplePipesClientMedium(
224
224
            process.stdout, process.stdin, url)
225
225
        transport = remote.RemoteTransport(url, medium=client_medium)
226
 
        branch = BzrDir.open_from_transport(transport).open_branch()
 
226
        branch = ControlDir.open_from_transport(transport).open_branch()
227
227
        process.stdin.close()
228
228
        # Hide stdin from the subprocess module, so it won't fail to close it.
229
229
        process.stdin = None