[Zodb-checkins] CVS: ZODB4/src/zodb - transact.py:1.1.2.2

[Jeremy Hylton]

Update of /cvs-repository/ZODB4/src/zodb
In directory cvs.zope.org:/tmp/cvs-serv29258

Modified Files:
      Tag: ZODB3-2-merge
	transact.py 
Log Message:
Update for ZODB4 module layout.


=== ZODB4/src/zodb/transact.py 1.1.2.1 => 1.1.2.2 ===
--- ZODB4/src/zodb/transact.py:1.1.2.1	Thu Jun 19 15:28:20 2003
+++ ZODB4/src/zodb/transact.py	Thu Jun 19 15:28:58 2003
@@ -13,7 +13,8 @@
 ##############################################################################
 """Tools to simplify transactions within applications."""
 
-from ZODB.POSException import ReadConflictError, ConflictError
+from transaction import get_transaction
+from zodb.interfaces import ReadConflictError, ConflictError
 
 def _commit(note):
     t = get_transaction()