Rev 4876: (mbp) treat python2.6 ImportWarning as indicating the module's not in file:///home/pqm/archives/thelove/bzr/2.1/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.1/

------------------------------------------------------------
revno: 4876 [merge]
revision-id: pqm at pqm.ubuntu.com-20110414045012-xkt5z58jzadwlkj2
parent: pqm at pqm.ubuntu.com-20110308160128-i49zm54b1d5tihcx
parent: mbp at sourcefrog.net-20110414040452-pmigz4j2pf57adxv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.1
timestamp: Thu 2011-04-14 04:50:12 +0000
message:
  (mbp) treat python2.6 ImportWarning as indicating the module's not
   available
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2010-11-30 20:42:42 +0000
+++ b/bzrlib/tests/__init__.py	2011-04-14 04:04:52 +0000
@@ -4162,7 +4162,7 @@
         try:
             self._module = __import__(self.module_name, {}, {}, [''])
             return True
-        except ImportError:
+        except (ImportWarning, ImportError):
             return False
 
     @property