[Zodb-checkins] CVS: Zope3/lib/python/Persistence/BTrees/tests - testConflict.py:1.1.2.4

[Jeremy Hylton]

Update of /cvs-repository/Zope3/lib/python/Persistence/BTrees/tests
In directory cvs.zope.org:/tmp/cvs-serv14472

Modified Files:
      Tag: Zope-3x-branch
	testConflict.py 
Log Message:
Get ConflictError from the right place.



=== Zope3/lib/python/Persistence/BTrees/tests/testConflict.py 1.1.2.3 => 1.1.2.4 ===
 from unittest import TestCase, TestSuite, TextTestRunner, makeSuite
 
-from ZODB.POSException import ConflictError
+from Transaction.Exceptions import ConflictError
 
 class Base:
     """ Tests common to all types: sets, buckets, and BTrees """