Rev 4924: (mbp) check testtools version after importing it in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4924 [merge]
revision-id: pqm at pqm.ubuntu.com-20091223075716-s7yaqku6wb4yh7ve
parent: pqm at pqm.ubuntu.com-20091223071515-trtmbl2kklwvbqrf
parent: mbp at sourcefrog.net-20091223063548-tfag80b2uc8ntgwe
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-12-23 07:57:16 +0000
message:
  (mbp) check testtools version after importing it
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2009-12-23 05:04:12 +0000
+++ b/bzrlib/tests/__init__.py	2009-12-23 06:35:48 +0000
@@ -51,6 +51,11 @@
 import warnings
 
 import testtools
+# nb: check this before importing anything else from within it
+_testtools_version = getattr(testtools, '__version__', ())
+if _testtools_version < (0, 9, 2):
+    raise ImportError("need at least testtools 0.9.2: %s is %r"
+        % (testtools.__file__, _testtools_version))
 from testtools import content
 
 from bzrlib import (