Merge lp:~jelmer/bzrtools/fix-bzr.dev-compat into lp:bzrtools

[Jelmer Vernooij]

Cope with HardlinkFeature having moved to bzrlib.tests.features in bzr.dev.

[lp:~jelmer/bzrtools/fix-bzr.dev-compat]

778. By Jelmer Vernooij on 2011-08-29

Fix deprecation warnings.

[Jonathan Riddell (jr)]

all good

review: Approve

[Aaron Bentley (abentley)]

Merged. Thanks!

review: Approve

=== modified file 'tests/blackbox.py'
--- tests/blackbox.py	2011-06-24 13:35:53 +0000
+++ tests/blackbox.py	2011-08-29 17:05:30 +0000
@@ -6,12 +6,21 @@
 from bzrlib.config import LocationConfig
 from bzrlib.transport import get_transport
 from bzrlib.tests import (
-    HardlinkFeature,
-    ModuleAvailableFeature,
     TestCaseWithTransport,
     )
 from bzrlib.plugins.bzrtools import command
 
+try:
+    from bzrlib.tests.features import (
+        HardlinkFeature,
+        ModuleAvailableFeature,
+        )
+except ImportError: # bzr < 2.5
+    from bzrlib.tests import (
+        HardlinkFeature,
+        ModuleAvailableFeature,
+        )
+
 
 LzmaFeature = ModuleAvailableFeature("lzma")
 
 
=== modified file 'tests/test_link_tree.py'
--- tests/test_link_tree.py	2010-02-25 04:15:18 +0000
+++ tests/test_link_tree.py	2011-08-29 17:05:30 +0000
@@ -17,7 +17,12 @@
 import os
 
 from bzrlib.transform import TreeTransform
-from bzrlib.tests import TestCaseWithTransport, HardlinkFeature
+from bzrlib.tests import TestCaseWithTransport
+
+try:
+    from bzrlib.tests.features import HardlinkFeature
+except ImportError: # bzr < 2.5
+    from bzrlib.tests import HardlinkFeature
 
 from bzrlib.plugins.bzrtools import command
 from bzrlib.plugins.bzrtools.link_tree import link_tree
 
=== modified file 'tests/upstream_import.py'
--- tests/upstream_import.py	2011-07-13 19:35:00 +0000
+++ tests/upstream_import.py	2011-08-29 17:05:30 +0000
@@ -26,8 +26,11 @@
 from bzrlib.tests import (
     TestCaseInTempDir,
     TestCaseWithTransport,
-    UnicodeFilenameFeature,
     )
+try:
+    from bzrlib.tests.features import UnicodeFilenameFeature
+except ImportError: # bzr < 2.5
+    from bzrlib.tests import UnicodeFilenameFeature
 
 
 def import_tar_broken(tree, tar_input):