[Zodb-checkins] CVS: Zope3/src/zodb/zeo/zrpc - error.py:1.3 client.py:1.3

Jeremy Hylton jeremy@zope.com
Wed, 5 Feb 2003 18:28:54 -0500


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

Modified Files:
	error.py client.py 
Log Message:
Merge storage-interface-branch to trunk.

Rename methods that had underscores to use camel case.
    new_oid => newObjectId
    tpc_begin => tpcBegin
    tpc_vote => tpcVote
    tpc_finish => tpcFinish
    tpc_abort => tpcAbort
    transactionalUndo => undo

Remove some methods from storage interfaces.
Move storage-related exceptions to zodb.storage.interfaces.
Add __implements__ to storages and use for introspection in place of
supportsXXX().


=== Zope3/src/zodb/zeo/zrpc/error.py 1.2 => 1.3 ===
--- Zope3/src/zodb/zeo/zrpc/error.py:1.2	Wed Dec 25 09:12:23 2002
+++ Zope3/src/zodb/zeo/zrpc/error.py	Wed Feb  5 18:28:20 2003
@@ -11,10 +11,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-from zodb import interfaces
+from zodb.storage.interfaces import StorageError
 from zodb.zeo.interfaces import Disconnected
 
-class ZRPCError(interfaces.StorageError):
+class ZRPCError(StorageError):
     pass
 
 class DisconnectedError(ZRPCError, Disconnected):


=== Zope3/src/zodb/zeo/zrpc/client.py 1.2 => 1.3 ===
--- Zope3/src/zodb/zeo/zrpc/client.py:1.2	Wed Dec 25 09:12:23 2002
+++ Zope3/src/zodb/zeo/zrpc/client.py	Wed Feb  5 18:28:20 2003
@@ -19,7 +19,7 @@
 import time
 import types
 
-from zodb.interfaces import ReadOnlyError
+from zodb.storage.interfaces import ReadOnlyError
 
 from zodb.zeo import threadedasync
 from zodb.zeo.zrpc import log