summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-07-25 14:43:52 +0200
committerJelmer Vernooij <jelmer@samba.org>2011-07-25 14:43:52 +0200
commit408d6c548a91f4d9d1cffc1371329105f3546ec5 (patch)
tree46a0101a59db8af7663e33848e544e9631b6f68d
parent8d055e5eae00c2bed564d28f39ba254a40297e08 (diff)
downloadbzr-fastimport-408d6c548a91f4d9d1cffc1371329105f3546ec5.tar.gz
Cope with Feature only being available from bzrlib.tests.features.
-rw-r--r--tests/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/__init__.py b/tests/__init__.py
index 47441e6..c013fc3 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -18,7 +18,8 @@
from bzrlib import errors as bzr_errors
-from bzrlib.tests import Feature, TestLoader
+from bzrlib.tests import TestLoader
+from bzrlib.tests.features import Feature
from bzrlib.plugins.fastimport import load_fastimport