summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-07-25 15:01:18 +0200
committerJelmer Vernooij <jelmer@samba.org>2011-07-25 15:01:18 +0200
commitade5e97d7af1f1eeeb5b875b9c66fcd871412d92 (patch)
tree23b2f34790eed0c5aadd51f38f7fb826f1c40729
parent408d6c548a91f4d9d1cffc1371329105f3546ec5 (diff)
downloadbzr-fastimport-ade5e97d7af1f1eeeb5b875b9c66fcd871412d92.tar.gz
Cope with older versions of bzr.
-rw-r--r--tests/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/__init__.py b/tests/__init__.py
index c013fc3..8db9140 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -19,7 +19,10 @@
from bzrlib import errors as bzr_errors
from bzrlib.tests import TestLoader
-from bzrlib.tests.features import Feature
+try:
+ from bzrlib.tests.features import Feature
+except ImportError: # bzr < 2.5
+ from bzrlib.tests import Feature
from bzrlib.plugins.fastimport import load_fastimport