Merge lp:~jelmer/bzr-grep/feature-move into lp:bzr-grep

[Jelmer Vernooij]

Cope with the fact that Feature has moved to bzrlib.tests.features in bzr.dev.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 8/15/2011 7:04 PM, Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/bzr-grep/lazy into
> lp:bzr-grep.
>
> Requested reviews: Bazaar Developers (bzr)
>
> For more details, see:
> https://code.launchpad.net/~jelmer/bzr-grep/lazy/+merge/71587
>
> Cope with the fact that Feature has moved to bzrlib.tests.features in
> bzr.dev.

 merge: approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk5KbJEACgkQJdeBCYSNAANewQCdF20d77YOLF4XxK97Q1HF6jvJ
0xAAnR4wTWkME57CR+jVZEV67fzeoZJt
=5IA0
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'features.py'
--- features.py	2010-05-22 12:35:19 +0000
+++ features.py	2011-08-15 17:05:07 +0000
@@ -16,9 +16,13 @@
 """'Features' which are used to skip tests."""
 
 from bzrlib import tests
+try:
+    from bzrlib.tests.features import Feature
+except ImportError: # bzr < 2.5
+    from bzrlib.tests import Feature
 from termcolor import allow_color
 
-class _ColorFeature(tests.Feature):
+class _ColorFeature(Feature):
 
     def _probe(self):
         return allow_color()