[Zope3-checkins] CVS: Zope3/src/zodb/zeo/zrpc - client.py:1.1.2.2 connection.py:1.1.2.3 server.py:1.1.2.2

[Barry Warsaw]

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

Modified Files:
      Tag: NameGeddon-branch
	client.py connection.py server.py 
Log Message:
more fixes

move threadedasync.py from the top level into zodb/zeo since it was
causing problems otherwise, and it's only used by zeo now.


=== Zope3/src/zodb/zeo/zrpc/client.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/zeo/zrpc/client.py:1.1.2.1	Mon Dec 23 14:30:54 2002
+++ Zope3/src/zodb/zeo/zrpc/client.py	Mon Dec 23 18:48:45 2002
@@ -19,10 +19,9 @@
 import time
 import types
 
-import ThreadedAsync
-
 from zodb.interfaces import ReadOnlyError
 
+from zodb.zeo import threadedasync
 from zodb.zeo.zrpc import log
 from zodb.zeo.zrpc.trigger import trigger
 from zodb.zeo.zrpc.connection import ManagedConnection
@@ -43,7 +42,7 @@
         self.thread = None # Protected by self.cond
         self.trigger = None
         self.thr_async = 0
-        ThreadedAsync.register_loop_callback(self.set_async)
+        zodb.zeo.threadedasync.register_loop_callback(self.set_async)
 
     def __repr__(self):
         return "<%s for %s>" % (self.__class__.__name__, self.addrlist)


=== Zope3/src/zodb/zeo/zrpc/connection.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/zeo/zrpc/connection.py:1.1.2.2	Mon Dec 23 16:52:55 2002
+++ Zope3/src/zodb/zeo/zrpc/connection.py	Mon Dec 23 18:48:45 2002
@@ -19,7 +19,7 @@
 import types
 import logging
 
-import ThreadedAsync
+from zodb.zeo import threadedasync
 from zodb.zeo.zrpc import smac
 from zodb.zeo.zrpc.error import ZRPCError, DisconnectedError
 from zodb.zeo.zrpc import log
@@ -339,7 +339,7 @@
 
     def _prepare_async(self):
         self.thr_async = 0
-        ThreadedAsync.register_loop_callback(self.set_async)
+        zodb.zeo.threadedasync.register_loop_callback(self.set_async)
         # XXX If we are not in async mode, this will cause dead
         # Connections to be leaked.
 


=== Zope3/src/zodb/zeo/zrpc/server.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/zeo/zrpc/server.py:1.1.2.1	Mon Dec 23 14:30:54 2002
+++ Zope3/src/zodb/zeo/zrpc/server.py	Mon Dec 23 18:48:45 2002
@@ -15,12 +15,12 @@
 import socket
 import types
 
+from zodb.zeo import threadedasync
 from zodb.zeo.zrpc.connection import Connection, Delay
 from zodb.zeo.zrpc import log
-import ThreadedAsync
 
 # Export the main asyncore loop
-loop = ThreadedAsync.loop
+loop = threadedasync.loop
 
 class Dispatcher(asyncore.dispatcher):
     """A server that accepts incoming RPC connections"""