← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/launchpad/__init__.py

  • Committer: Patch Queue Manager
  • Date: 2012-03-06 19:49:19 UTC
  • mfrom: (6472.2.6 use-bzr-controldir)
  • Revision ID: pqm@pqm.ubuntu.com-20120306194919-kt7mj6xmhifsgees
(jelmer) Use bzrlib.controldir for generic access to control directories,
 rather than bzrlib.bzrdir. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/__init__.py
53
53
 
54
54
from bzrlib import (
55
55
    branch as _mod_branch,
56
 
    bzrdir,
57
56
    config as _mod_config,
 
57
    controldir,
58
58
    lazy_regex,
59
59
    # Since we are a built-in plugin we share the bzrlib version
60
60
    version_info,
353
353
    def run(self, submit_branch=None, review=None, staging=False,
354
354
            message=None, approve=False, fixes=None):
355
355
        from bzrlib.plugins.launchpad import lp_propose
356
 
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
 
356
        tree, branch, relpath = controldir.ControlDir.open_containing_tree_or_branch(
357
357
            '.')
358
358
        if review is None:
359
359
            reviews = None