[Zope3-checkins] CVS: Zope3/src/zodb/zeo/tests - zeoserver.py:1.1.2.2

Barry Warsaw barry@wooz.org
Mon, 23 Dec 2002 17:34:24 -0500


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

Modified Files:
      Tag: NameGeddon-branch
	zeoserver.py 
Log Message:
more fixes


=== Zope3/src/zodb/zeo/tests/zeoserver.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/zeo/tests/zeoserver.py:1.1.2.1	Mon Dec 23 14:30:53 2002
+++ Zope3/src/zodb/zeo/tests/zeoserver.py	Mon Dec 23 17:34:20 2002
@@ -21,17 +21,17 @@
 import socket
 import logging
 import asyncore
-import .threadedasync
+import threadedasync
 
 import ZConfig
-from zodb import StorageConfig
+from zodb import config
 import zodb.zeo.server
 
 
 def load_storage(fp):
     rootconf = ZConfig.loadfile(fp)
     storageconf = rootconf.getSection('Storage')
-    return StorageConfig.createStorage(storageconf)
+    return config.createStorage(storageconf)
 
 
 def cleanup(storage):
@@ -150,9 +150,9 @@
         sys.exit(2)
     addr = ('', zeo_port)
     logger.info('creating the storage server')
-    serv = ZEO.StorageServer.StorageServer(addr, {'1': storage}, ro_svr)
+    serv = zodb.zeo.server.StorageServer(addr, {'1': storage}, ro_svr)
     logger.info('entering ThreadedAsync loop')
-    ThreadedAsync.LoopCallback.loop()
+    threadedasync.loop()
 
 
 if __name__ == '__main__':