[Zope-Checkins] CVS: Zope/lib/python/BTrees/tests - testConflict.py:

Jeffrey P Shell jeffrey@zope.com
Wed, 8 Aug 2001 15:35:56 -0400

Update of /cvs-repository/Zope/lib/python/BTrees/tests
In directory cvs.zope.org:/tmp/cvs-serv753

Modified Files:
      Tag: Zope-2_4-branch
Log Message:
Now that unittest.py is removed from the 2.4 Branch, removed import
trickery meant to handle dual unittest framework versions.  Based on
similar changes in the HEAD.

=== Zope/lib/python/BTrees/tests/testConflict.py => ===
 from BTrees.IIBTree import IIBTree, IIBucket, IISet, IITreeSet
 from BTrees.OIBTree import OIBTree, OIBucket, OISet, OITreeSet
-    from unittest import VerboseTextTestRunner
-    TextTestRunner = VerboseTextTestRunner
-except ImportError, NameError:
-    from unittest import TextTestRunner
-from unittest import TestCase, TestSuite, makeSuite
+from unittest import TestCase, TestSuite, TextTestRunner, makeSuite
 class Base:
     """ Tests common to all types: sets, buckets, and BTrees """
@@ -514,7 +507,7 @@
 def main():
-    runner = TextTestRunner()
+    runner = TextTestRunner(verbosity=2)
 def debug():