[Zodb-checkins] CVS: StandaloneZODB/ZEO - StorageServer.py:1.31

[Jeremy Hylton]

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

Modified Files:
	StorageServer.py 
Log Message:
Finish merging changes from the zeo-1_0-branch.

Not sure how this one got missed.


=== StandaloneZODB/ZEO/StorageServer.py 1.30 => 1.31 ===
 from ZEO import trigger
 from ZEO import asyncwrap
+from types import StringType
 
 class StorageServerError(POSException.StorageError): pass
 
@@ -421,7 +422,6 @@
             if wait:
                 self.message_output('RN.')
                 self.__server._pack_trigger.pull_trigger()
-
             else:
                 # Broadcast new size statistics
                 self.__server.invalidate(0, self.__storage_id, (),
@@ -607,4 +607,3 @@
     d = {'1': ZODB.FileStorage.FileStorage(name)}
     StorageServer(port, d)
     asyncwrap.loop()
-