[Zope-Checkins] CVS: Zope/lib/python/Zope/Startup - __init__.py:1.2.2.1

Fred L. Drake, Jr. fred@zope.com
Wed, 5 Feb 2003 18:30:47 -0500


Update of /cvs-repository/Zope/lib/python/Zope/Startup
In directory cvs.zope.org:/tmp/cvs-serv17341

Modified Files:
      Tag: new-install-branch
	__init__.py 
Log Message:
Partial update to reflect use of the new ZServer configuration
support.


=== Zope/lib/python/Zope/Startup/__init__.py 1.2 => 1.2.2.1 ===
--- Zope/lib/python/Zope/Startup/__init__.py:1.2	Wed Jan 29 15:25:15 2003
+++ Zope/lib/python/Zope/Startup/__init__.py	Wed Feb  5 18:30:44 2003
@@ -112,13 +112,14 @@
             'bind to the port which the server is trying to use or the '
             'port may already be in use by another application.'
             )
-        for server_type, server in cfg.servers:
+        for server in cfg.servers:
             # create the server from the server factory
             # set up in the config
             try:
-                server()
+                server.create()
             except socket.error:
-                raise ZConfig.ConfigurationError(socket_err % server_type)
+                raise ZConfig.ConfigurationError(socket_err
+                                                 % server.servertype())
 
     # do stuff that only applies to posix platforms (setuid, daemonizing)
     if os.name == 'posix':