← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/blackbox.py

  • Committer: Aaron Bentley
  • Date: 2011-09-25 01:17:15 UTC
  • mfrom: (776.1.2 fix-bzr.dev-compat)
  • Revision ID: aaron@aaronbentley.com-20110925011715-o1akrv7xjl3e4iys
Fixed compatibility with bzr.dev (jelmer)

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/blackbox.py
6
6
from bzrlib.config import LocationConfig
7
7
from bzrlib.transport import get_transport
8
8
from bzrlib.tests import (
9
 
    HardlinkFeature,
10
 
    ModuleAvailableFeature,
11
9
    TestCaseWithTransport,
12
10
    )
13
11
from bzrlib.plugins.bzrtools import command
14
12
 
 
13
try:
 
14
    from bzrlib.tests.features import (
 
15
        HardlinkFeature,
 
16
        ModuleAvailableFeature,
 
17
        )
 
18
except ImportError: # bzr < 2.5
 
19
    from bzrlib.tests import (
 
20
        HardlinkFeature,
 
21
        ModuleAvailableFeature,
 
22
        )
 
23
 
15
24
 
16
25
LzmaFeature = ModuleAvailableFeature("lzma")
17
26