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

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5638 [merge]
revision-id: pqm at pqm.ubuntu.com-20110414064609-9sqkevpc19hvszb5
parent: pqm at pqm.ubuntu.com-20110408080330-q7hax4s1ftkp5p46
parent: mbp at sourcefrog.net-20110414042108-e7fpsbks79em711b
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.3
timestamp: Thu 2011-04-14 06:46:09 +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	2011-04-01 00:21:19 +0000
+++ b/bzrlib/tests/__init__.py	2011-04-14 04:21:08 +0000
@@ -4341,7 +4341,7 @@
         try:
             self._module = __import__(self.module_name, {}, {}, [''])
             return True
-        except ImportError:
+        except (ImportWarning, ImportError):
             return False
 
     @property