[Zodb-checkins] CVS: StandaloneZODB/ZEO - smac.py:1.9.6.8

[Jeremy Hylton]

Update of /cvs-repository/StandaloneZODB/ZEO
In directory cvs.zope.org:/tmp/cvs-serv12141

Modified Files:
      Tag: ZEO-ZRPC-Dev
	smac.py 
Log Message:
Cleanup imports.

Replace zeolog imports with zLOG.
Replace string module with string method.
Remove other unused imports.

XXX This blasted code shouldn't have worked.  If you remove a module
from a distutils package, you also have to do a distutils clean.  I
didn't, which seems to have allowed broken code to creep into CVS.



=== StandaloneZODB/ZEO/smac.py 1.9.6.7 => 1.9.6.8 ===
 __version__ = "$Revision$"[11:-2]
 
-import asyncore, string, struct, sys, Acquisition
+import asyncore, struct
 from Exceptions import Disconnected
-from zeolog import LOG, TRACE, ERROR, INFO, BLATHER
+from zLOG import LOG, TRACE, ERROR, INFO, BLATHER
 from types import StringType
 
 import socket, errno
@@ -174,7 +174,7 @@
             inp = d
         else:
             inp.append(d)
-            inp = string.join(inp, '')
+            inp = "".join(inp)
 
         offset = 0
         while (offset + msg_size) <= input_len: