[Zope-Checkins] CVS: Zope/lib/python/ZEO/zrpc - client.py:1.28 smac.py:1.41

[Jim Fulton]

Update of /cvs-repository/Zope/lib/python/ZEO/zrpc
In directory cvs.zope.org:/tmp/cvs-serv3783/lib/python/ZEO/zrpc

Modified Files:
	client.py smac.py 
Log Message:
Merged Jeremy and Tim's changes from the zodb33-devel-branch.


=== Zope/lib/python/ZEO/zrpc/client.py 1.27 => 1.28 ===
--- Zope/lib/python/ZEO/zrpc/client.py:1.27	Thu Oct  2 14:17:20 2003
+++ Zope/lib/python/ZEO/zrpc/client.py	Fri Nov 28 11:44:49 2003
@@ -85,6 +85,7 @@
     def close(self):
         """Prevent ConnectionManager from opening new connections"""
         self.closed = 1
+        ThreadedAsync.remove_loop_callback(self.set_async)
         self.cond.acquire()
         try:
             t = self.thread


=== Zope/lib/python/ZEO/zrpc/smac.py 1.40 => 1.41 ===
--- Zope/lib/python/ZEO/zrpc/smac.py:1.40	Thu Oct  2 18:14:03 2003
+++ Zope/lib/python/ZEO/zrpc/smac.py	Fri Nov 28 11:44:49 2003
@@ -16,7 +16,7 @@
 This class extends the basic asyncore layer with a record-marking
 layer.  The message_output() method accepts an arbitrary sized string
 as its argument.  It sends over the wire the length of the string
-encoded using struct.pack('>i') and the string itself.  The receiver
+encoded using struct.pack('>I') and the string itself.  The receiver
 passes the original string to message_input().
 
 This layer also supports an optional message authentication code