[Zodb-checkins] CVS: StandaloneZODB/ZEO - smac.py:1.9.6.6 zrpc2.py:1.1.2.15

[Jim Fulton]

Update of /cvs-repository/StandaloneZODB/ZEO
In directory cvs.zope.org:/tmp/cvs-serv27100/ZEO

Modified Files:
      Tag: ZEO-ZRPC-Dev
	smac.py zrpc2.py 
Log Message:
Make use of the Disconnected base exception.

=== StandaloneZODB/ZEO/smac.py 1.9.6.5 => 1.9.6.6 ===
 
 import asyncore, string, struct, sys, Acquisition
+from Exceptions import Disconnected
 from zeolog import LOG, TRACE, ERROR, INFO, BLATHER
 from types import StringType
 
@@ -213,7 +214,3 @@
         if self.__closed is None:
             self.__closed = 1
             self.__super_close()
-
-class Disconnected(Exception):
-    """The client has become disconnected from the server"""
-    


=== StandaloneZODB/ZEO/zrpc2.py 1.1.2.14 => 1.1.2.15 ===
 from ZODB import POSException
 from ZEO import smac, trigger
+from Exceptions import Disconnected
 import zeolog
 import ThreadedAsync
 
@@ -56,7 +57,7 @@
 class DecodingError(ZRPCError):
     """A ZRPC message could not be decoded."""
 
-class DisconnectedError(ZRPCError):
+class DisconnectedError(ZRPCError, Disconnected):
     """The database storage is disconnected from the storage server."""
 
 # Export the mainloop function from asycnore to zrpc clients