~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2011-11-24 15:48:29 UTC
  • mfrom: (6289 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6337.
  • Revision ID: v.ladeuil+lp@free.fr-20111124154829-avowjpsxdl8yp2vz
merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
 
18
18
from bzrlib import config, errors, osutils
19
19
from bzrlib.tests import (
20
 
    ModuleAvailableFeature,
21
20
    TestCase,
22
21
    TestCaseWithTransport,
23
22
    )
 
23
from bzrlib.tests.features import (
 
24
    ModuleAvailableFeature,
 
25
    )
24
26
 
25
27
 
26
28
launchpadlib_feature = ModuleAvailableFeature('launchpadlib')