Rev 5780: (jelmer) Catch ImportWarning as well when checking for modules in features. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5780 [merge]
revision-id: pqm at pqm.ubuntu.com-20110411165943-g2uhdcy7zz164e4x
parent: pqm at pqm.ubuntu.com-20110411033021-k2a68wj7n1zfhxrn
parent: jelmer at samba.org-20110411151550-vn2sbx9gtsqa9hvm
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2011-04-11 16:59:43 +0000
message:
  (jelmer) Catch ImportWarning as well when checking for modules in features.
   (Jelmer Vernooij)
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2011-04-05 12:11:26 +0000
+++ b/bzrlib/tests/__init__.py	2011-04-11 15:15:50 +0000
@@ -4355,7 +4355,7 @@
         try:
             self._module = __import__(self.module_name, {}, {}, [''])
             return True
-        except ImportError:
+        except (ImportError, ImportWarning):
             return False
 
     @property