[Zope3-checkins] CVS: Zope3/src/zodb/zeo/zrpc - error.py:1.1.2.3 smac.py:1.1.2.2

[Guido van Rossum]

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

Modified Files:
      Tag: NameGeddon-branch
	error.py smac.py 
Log Message:
There was a really weird error: cPickle couldn't pickle an exception
because there was a local module exceptions.  Somehow cPickle is
doing a relative import. :-(

Rather than fix cPickle (which should be done as well), removed the
exceptions submodule, and move its contents into interfaces.py.
There was only one exception defined.


=== Zope3/src/zodb/zeo/zrpc/error.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/zeo/zrpc/error.py:1.1.2.2	Mon Dec 23 16:52:55 2002
+++ Zope3/src/zodb/zeo/zrpc/error.py	Tue Dec 24 13:02:43 2002
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 from zodb import interfaces
-from zodb.zeo.exceptions import Disconnected
+from zodb.zeo.interfaces import Disconnected
 
 class ZRPCError(interfaces.StorageError):
     pass


=== Zope3/src/zodb/zeo/zrpc/smac.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/zeo/zrpc/smac.py:1.1.2.1	Mon Dec 23 14:30:54 2002
+++ Zope3/src/zodb/zeo/zrpc/smac.py	Tue Dec 24 13:02:43 2002
@@ -18,7 +18,7 @@
 import socket, errno
 from types import StringType
 
-from zodb.zeo.exceptions import Disconnected
+from zodb.zeo.interfaces import Disconnected
 from zodb.zeo.zrpc import log
 
 # Use the dictionary to make sure we get the minimum number of errno