Rev 5129: (mbp) merge 2.1 up to 2.2 in file:///home/pqm/archives/thelove/bzr/2.2/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5129 [merge]
revision-id: pqm at pqm.ubuntu.com-20110415094604-jql1ptxinbh4zvnk
parent: pqm at pqm.ubuntu.com-20110414060631-89adz5q7wz570d1o
parent: mbp at sourcefrog.net-20110415070927-mi1yxi4w54i9feaz
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.2
timestamp: Fri 2011-04-15 09:46:04 +0000
message:
  (mbp) merge 2.1 up to 2.2
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'Makefile'
--- a/Makefile	2010-04-06 06:59:03 +0000
+++ b/Makefile	2011-04-15 07:09:27 +0000
@@ -40,7 +40,7 @@
 
 check-nodocs: extensions
 	# Generate a stream for PQM to watch.
-	$(PYTHON) -Werror -O ./bzr selftest --subunit $(tests) | tee selftest.log
+	$(PYTHON) -Werror -Wignore::ImportWarning -O ./bzr selftest --subunit $(tests) | tee selftest.log
 	# Check that there were no errors reported.
 	subunit-stats < selftest.log
 

=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2011-04-14 04:12:54 +0000
+++ b/bzrlib/tests/__init__.py	2011-04-15 07:09:27 +0000
@@ -4275,7 +4275,7 @@
         try:
             self._module = __import__(self.module_name, {}, {}, [''])
             return True
-        except (ImportWarning, ImportError):
+        except ImportError:
             return False
 
     @property