Rev 4877: (mbp) use -Wignore rather than catching ImportWarning, in file:///home/pqm/archives/thelove/bzr/2.1/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4877 [merge]
revision-id: pqm at pqm.ubuntu.com-20110415061837-3xup27i6ikx6wt9m
parent: pqm at pqm.ubuntu.com-20110414045012-xkt5z58jzadwlkj2
parent: mbp at sourcefrog.net-20110415013356-tujnzktf29e61h0e
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.1
timestamp: Fri 2011-04-15 06:18:37 +0000
message:
  (mbp) use -Wignore rather than catching ImportWarning,
   to restore py2.4 compatibility (Martin Pool)
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'Makefile'
--- a/Makefile	2010-02-17 17:11:16 +0000
+++ b/Makefile	2011-04-15 01:33:56 +0000
@@ -39,7 +39,7 @@
 check: docs check-nodocs
 
 check-nodocs: extensions
-	$(PYTHON) -Werror -O ./bzr selftest -1v $(tests)
+	$(PYTHON) -Werror -Wignore::ImportWarning -O ./bzr selftest -1v $(tests)
 
 # Run Python style checker (apt-get install pyflakes)
 #

=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2011-04-14 04:04:52 +0000
+++ b/bzrlib/tests/__init__.py	2011-04-14 23:51:25 +0000
@@ -4162,7 +4162,7 @@
         try:
             self._module = __import__(self.module_name, {}, {}, [''])
             return True
-        except (ImportWarning, ImportError):
+        except ImportError:
             return False
 
     @property