[Zope3-checkins] CVS: Zope3/src/zodb - connection.py:1.1.2.2

[Barry Warsaw]

Update of /cvs-repository/Zope3/src/zodb
In directory cvs.zope.org:/tmp/cvs-serv14542/src/zodb

Modified Files:
      Tag: NameGeddon-branch
	connection.py 
Log Message:
Deunfrakificationlinessification


=== Zope3/src/zodb/connection.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/connection.py:1.1.2.1	Mon Dec 23 14:30:43 2002
+++ Zope3/src/zodb/connection.py	Mon Dec 23 16:52:52 2002
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 # 
 ##############################################################################
-from zodb import POSException
+from zodb import interfaces
 from zodb.utils import p64, u64, Set, z64
 
 import tempfile
@@ -53,7 +53,7 @@
         self._file.seek(pos)
         h = self._file.read(24)
         if h[:8] != oid:
-            raise POSException.StorageSystemError('Bad temporary storage')
+            raise interfaces.StorageSystemError('Bad temporary storage')
         size = u64(h[16:])
         serial = h[8:16]
         return self._file.read(size), serial
@@ -74,7 +74,7 @@
 
     def store(self, oid, serial, data, version, transaction):
         if transaction is not self._transaction:
-            raise POSException.StorageTransactionError(self, transaction)
+            raise interfaces.StorageTransactionError(self, transaction)
         self._file.seek(self._pos)
         l = len(data)
         if serial is None:
@@ -124,7 +124,7 @@
     def rollback(self, pos, index):
         if not (pos <= self._tpos <= self._pos):
             msg = "transaction rolled back to early point"
-            raise POSException.RollbackError(msg)
+            raise interfaces.RollbackError(msg)
         self._tpos = self._pos = pos
         self._index = index
         self._tindex.clear()
@@ -176,7 +176,7 @@
 $Id$
 """
 
-from zodb import ExportImport
+from zodb import export
 
 from zodb.conflict import ResolvedSerial
 from zodb.interfaces import IConnection
@@ -197,7 +197,7 @@
 from types import StringType, ClassType, TupleType
 import logging
 
-class Connection(ExportImport.ExportImport):
+class Connection(export.ExportImport):
     """Object managers for individual object space.
 
     An object space is a version of collection of objects.  In a