[Zodb-checkins] CVS: ZODB4/ZODB - interfaces.py:1.2 POSException.py:1.20 DB.py:1.61 ConflictResolution.py:1.22

[Jeremy Hylton]

Update of /cvs-repository/ZODB4/ZODB
In directory cvs.zope.org:/tmp/cvs-serv6382/ZODB

Modified Files:
	interfaces.py POSException.py DB.py ConflictResolution.py 
Log Message:
Consolidate interfaces in Transaction package


=== ZODB4/ZODB/interfaces.py 1.1 => 1.2 ===
--- ZODB4/ZODB/interfaces.py:1.1	Fri Dec 20 13:30:45 2002
+++ ZODB4/ZODB/interfaces.py	Fri Dec 20 13:55:08 2002
@@ -12,7 +12,7 @@
 # 
 ##############################################################################
 from Interface import Interface
-from Transaction.ITransaction import ITransaction
+from Transaction.interfaces import ITransaction
 
 class IConnection(Interface):
     """Interface required of Connection by ZODB DB.


=== ZODB4/ZODB/POSException.py 1.19 => 1.20 ===
--- ZODB4/ZODB/POSException.py:1.19	Wed Dec 11 18:40:50 2002
+++ ZODB4/ZODB/POSException.py	Fri Dec 20 13:55:08 2002
@@ -16,7 +16,7 @@
 $Id$
 """
 
-from Transaction.Exceptions \
+from Transaction.interfaces \
      import TransactionError, RollbackError, ConflictError as _ConflictError
 
 from types import StringType, DictType


=== ZODB4/ZODB/DB.py 1.60 => 1.61 ===
--- ZODB4/ZODB/DB.py:1.60	Thu Dec 19 17:20:58 2002
+++ ZODB4/ZODB/DB.py	Fri Dec 20 13:55:08 2002
@@ -31,7 +31,7 @@
 from ZODB.utils import z64
 
 from Transaction import get_transaction
-from Transaction.IDataManager import IDataManager
+from Transaction.interfaces import IDataManager
 
 class DB:
     """The Object Database


=== ZODB4/ZODB/ConflictResolution.py 1.21 => 1.22 ===
--- ZODB4/ZODB/ConflictResolution.py:1.21	Thu Dec 19 16:51:36 2002
+++ ZODB4/ZODB/ConflictResolution.py	Fri Dec 20 13:55:08 2002
@@ -22,7 +22,7 @@
 from cPickle import PicklingError
 import logging
 
-from Transaction.Exceptions import ConflictError
+from Transaction.interfaces import ConflictError
 from ZODB.Serialize import BaseObjectReader, ObjectWriter, getClassMetadata
 
 ResolvedSerial = "rs"