Rev 5640: Use -Wignore::ImportWarning rather than catching it, in file:///home/pqm/archives/thelove/bzr/2.3/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5640 [merge]
revision-id: pqm at pqm.ubuntu.com-20110416002029-nbeg4p8wwlh4wtkj
parent: pqm at pqm.ubuntu.com-20110414072246-gac895d95p35g4q9
parent: mbp at sourcefrog.net-20110415233243-q0lmx1uae6lo2rb2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.3
timestamp: Sat 2011-04-16 00:20:29 +0000
message:
  Use -Wignore::ImportWarning rather than catching it,
   to restore py2.4 compatibility
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'Makefile'
--- a/Makefile	2010-10-15 10:19:25 +0000
+++ b/Makefile	2011-04-15 23:32:43 +0000
@@ -42,7 +42,7 @@
 	set -e
 	# Generate a stream for PQM to watch.
 	-$(RM) -f selftest.log
-	$(PYTHON) -Werror -O ./bzr selftest --subunit $(tests) | tee selftest.log
+	$(PYTHON) -Werror -Wignore::ImportWarning -O ./bzr selftest --subunit $(tests) | tee selftest.log
 	# An empty log file should catch errors in the $(PYTHON)
 	# command above (the '|' swallow any errors since 'make'
 	# sees the 'tee' exit code for the whole line

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