Changed to get cPickle from ZODB.

src/ZEO/Invalidator.py

@@ -87,7 +87,8 @@
 Note that this is not *really* atomic, but it is close enough.
 """
 
-import tempfile, cPickle
+from ZODB import cPickle
+import tempfile
 
 class Invalidator:
 

src/ZEO/StorageServer.py

@@ -83,18 +83,18 @@
 # 
 ##############################################################################
 
-__version__ = "$Revision: 1.19 $"[11:-2]
+__version__ = "$Revision: 1.20 $"[11:-2]
 
-import asyncore, socket, string, sys, cPickle, os
+import asyncore, socket, string, sys, os
 from smac import SizedMessageAsyncConnection
-from ZODB import POSException
+from ZODB import POSException, cPickle
+from ZODB.cPickle import Unpickler
 from ZODB.POSException import TransactionError, UndoError, VersionCommitError
 from ZODB.Transaction import Transaction
 import traceback
 from zLOG import LOG, INFO, ERROR, TRACE
 from ZODB.referencesf import referencesf
 from thread import start_new_thread
-from cPickle import Unpickler
 from cStringIO import StringIO
 
 class StorageServerError(POSException.StorageError): pass

src/ZEO/zrpc.py

@@ -85,12 +85,13 @@
 """Simple rpc mechanisms
 """
 
-__version__ = "$Revision: 1.9 $"[11:-2]
+__version__ = "$Revision: 1.10 $"[11:-2]
 
-from cPickle import loads
+from ZODB.cPickle import loads
+from ZODB import cPickle
 from thread import allocate_lock
 from smac import SizedMessageAsyncConnection
-import socket, string, struct, asyncore, sys, time, cPickle
+import socket, string, struct, asyncore, sys, time
 TupleType=type(())
 from zLOG import LOG, TRACE, DEBUG, INFO