[Zodb-checkins] CVS: Zope/lib/python/BTrees/tests - testConflict.py:1.2.36.3

[Jeffrey P Shell]

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

Modified Files:
      Tag: Zope-2_4-branch
	testConflict.py 
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 1.2.36.2 => 1.2.36.3 ===
 from BTrees.IIBTree import IIBTree, IIBucket, IISet, IITreeSet
 from BTrees.OIBTree import OIBTree, OIBucket, OISet, OITreeSet
-
-try:
-    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():
     alltests=test_suite()
-    runner = TextTestRunner()
+    runner = TextTestRunner(verbosity=2)
     runner.run(alltests)
 
 def debug():