[Zope3-checkins] CVS: Zope3/src/zodb/zeo - client.py:1.1.2.5 interfaces.py:1.1.2.2 exceptions.py:NONE

[Guido van Rossum]

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

Modified Files:
      Tag: NameGeddon-branch
	client.py interfaces.py 
Removed Files:
      Tag: NameGeddon-branch
	exceptions.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/client.py 1.1.2.4 => 1.1.2.5 ===
--- Zope3/src/zodb/zeo/client.py:1.1.2.4	Tue Dec 24 12:10:17 2002
+++ Zope3/src/zodb/zeo/client.py	Tue Dec 24 13:02:42 2002
@@ -15,6 +15,7 @@
 
 Public contents of this module:
 
+Disconnected -- exception base class
 ClientStorage -- the main class, implementing the Storage API
 ClientStorageError -- exception raised by ClientStorage
 UnrecognizedResult -- exception raised by ClientStorage
@@ -36,8 +37,8 @@
 import logging
 
 from zodb.zeo import cache, stubs
+from zodb.zeo.interfaces import Disconnected
 from zodb.zeo.tbuf import TransactionBuffer
-from zodb.zeo.exceptions import Disconnected
 from zodb.zeo.zrpc.client import ConnectionManager
 
 from zodb import interfaces


=== Zope3/src/zodb/zeo/interfaces.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/zeo/interfaces.py:1.1.2.1	Mon Dec 23 14:30:52 2002
+++ Zope3/src/zodb/zeo/interfaces.py	Tue Dec 24 13:02:42 2002
@@ -1,4 +1,25 @@
+##############################################################################
+#
+# Copyright (c) 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""ZEO interfaces and exceptions.
+
+$Id$
+"""
+
 from zope.interface import Interface
+
+class Disconnected(Exception):
+    """A client is disconnected from a server."""
 
 class ICache(Interface):
     """ZEO client cache.

=== Removed File Zope3/src/zodb/zeo/exceptions.py ===