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

[Barry Warsaw]

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

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


=== Zope3/src/zodb/zeo/client.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/zeo/client.py:1.1.2.1	Mon Dec 23 14:30:52 2002
+++ Zope3/src/zodb/zeo/client.py	Mon Dec 23 16:52:54 2002
@@ -40,7 +40,7 @@
 from zodb.zeo.exceptions import Disconnected
 from zodb.zeo.zrpc.client import ConnectionManager
 
-from zodb import POSException
+from zodb import interfaces
 from zodb.timestamp import TimeStamp
 
 try:
@@ -48,7 +48,7 @@
 except ImportError:
     ResolvedSerial = 'rs'
 
-class ClientStorageError(POSException.StorageError):
+class ClientStorageError(interfaces.StorageError):
     """An error occured in the ZEO Client Storage."""
 
 class UnrecognizedResult(ClientStorageError):
@@ -324,7 +324,7 @@
         try:
             stub.register(str(self._storage), self._is_read_only)
             return 1
-        except POSException.ReadOnlyError:
+        except interfaces.ReadOnlyError:
             if not self._read_only_fallback:
                 raise
             self.logger.warn(
@@ -455,9 +455,9 @@
     def _check_trans(self, trans):
         """Internal helper to check a transaction argument for sanity."""
         if self._is_read_only:
-            raise POSException.ReadOnlyError()
+            raise interfaces.ReadOnlyError()
         if self._transaction is not trans:
-            raise POSException.StorageTransactionError(self._transaction,
+            raise interfaces.StorageTransactionError(self._transaction,
                                                        trans)
 
     def abortVersion(self, version, transaction):
@@ -544,7 +544,7 @@
     def new_oid(self):
         """Storage API: return a new object identifier."""
         if self._is_read_only:
-            raise POSException.ReadOnlyError()
+            raise interfaces.ReadOnlyError()
         # avoid multiple oid requests to server at the same time
         self._oid_lock.acquire()
         try:
@@ -604,7 +604,7 @@
     def tpc_begin(self, txn, tid=None, status=' '):
         """Storage API: begin a transaction."""
         if self._is_read_only:
-            raise POSException.ReadOnlyError()
+            raise interfaces.ReadOnlyError()
         self._tpc_cond.acquire()
         while self._transaction is not None:
             # It is allowable for a client to call two tpc_begins in a
@@ -730,7 +730,7 @@
     def undo(self, transaction_id):
         """Storage API: undo a transaction, writing directly to the storage."""
         if self._is_read_only:
-            raise POSException.ReadOnlyError()
+            raise interfaces.ReadOnlyError()
         # XXX what are the sync issues here?
         oids = self._server.undo(transaction_id)
         for oid in oids: