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

[Jeffrey P Shell]

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

Modified Files:
      Tag: Zope-2_4-branch
	testConflict.py 
Log Message:
Added code to make testBTrees.py friendly to newer versions of
unittest.py.  Patch suggested by Chris Withers (Collector issue 2455)


=== Zope/lib/python/BTrees/tests/testConflict.py 1.2.36.1 => 1.2.36.2 ===
 from BTrees.IIBTree import IIBTree, IIBucket, IISet, IITreeSet
 from BTrees.OIBTree import OIBTree, OIBucket, OISet, OITreeSet
-from unittest import TestCase, TestSuite, JUnitTextTestRunner, VerboseTextTestRunner, makeSuite
 
-TextTestRunner = VerboseTextTestRunner
+try:
+    from unittest import VerboseTextTestRunner
+    TextTestRunner = VerboseTextTestRunner
+except ImportError, NameError:
+    from unittest import TextTestRunner
+from unittest import TestCase, TestSuite, makeSuite
+
 
 class Base:
     """ Tests common to all types: sets, buckets, and BTrees """