[Zope-Checkins] CVS: Zope/lib/python/Zope/Startup - handlers.py:1.1.2.5

[Fred L. Drake, Jr.]

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

Modified Files:
      Tag: chrism-install-branch
	handlers.py 
Log Message:
Remove code cruftiness.


=== Zope/lib/python/Zope/Startup/handlers.py 1.1.2.4 => 1.1.2.5 ===
--- Zope/lib/python/Zope/Startup/handlers.py:1.1.2.4	Wed Jan 15 11:37:54 2003
+++ Zope/lib/python/Zope/Startup/handlers.py	Mon Jan 27 12:54:27 2003
@@ -6,8 +6,7 @@
 # top-level key handlers
 
 def _setenv(name, value):
-    if (  isinstance(value, types.StringType)
-          or isinstance(value, types.UnicodeType)):
+    if isinstance(value, types.StringTypes):
         os.environ[name] = value
     else:
         os.environ[name] = `value`
@@ -201,9 +200,8 @@
             from datatypes import DBWrapper, Factory
             storagefactory = Factory(
                 'ZODB.FileStorage.FileStorage', None,
-                *[os.path.join(config.client_home, 'Data.fs')], **{}
-                )
-            dbfactory = Factory('ZODB.DB', None, *[], **{})
+                os.path.join(config.client_home, 'Data.fs'))
+            dbfactory = Factory('ZODB.DB', None)
             databases.append((['/'], DBWrapper(dbfactory, storagefactory)))
 
         # do command-line overrides
@@ -238,53 +236,52 @@
         l = []
         from ZServer import zhttp_server, zhttp_handler
         for addr, port in section.ports:
-            kw = make_dict(ip=addr, port=port,
-                           resolver=self._resolver,
-                           logger_object=self._logger)
             def callback(inst, self=self):
                 handler = zhttp_handler(self._module, '', self._env)
                 inst.install_handler(handler)
                 if section.force_connection_close:
                     handler._force_connection_close = 1
-            serverfactory = Factory(
-                'ZServer.zhttp_server', callback, *[], **kw)
+            serverfactory = Factory('ZServer.zhttp_server', callback,
+                                    ip=addr, port=port,
+                                    resolver=self._resolver,
+                                    logger_object=self._logger)
             l.append(serverfactory)
         return l
 
     def webdav_source_server(self, section):
         l = []
         for addr, port in section.ports:
-            kw = make_dict(ip=addr, port=port,
-                           resolver=self._resolver,
-                           logger_object=self._logger)
             def callback(inst, self=self):
                 from ZServer.WebDAVSrcHandler import WebDAVSrcHandler
                 handler = WebDAVSrcHandler(self._module, '', self._env)
                 inst.install_handler(handler)
                 if section.force_connection_close:
                     handler._force_connection_close = 1
-            serverfactory = Factory(
-                'ZServer.zhttp_server', callback, *[], **kw)
+            serverfactory = Factory('ZServer.zhttp_server', callback,
+                                    ip=addr, port=port,
+                                    resolver=self._resolver,
+                                    logger_object=self._logger)
             l.append(serverfactory)
         return l
 
     def ftp_server(self, section):
         l = []
         for addr, port in section.ports:
-            kw = make_dict(module=self._module, ip=addr, port=port,
-                             resolver=self._resolver,
-                             logger_object=self._logger)
-            serverfactory=Factory('ZServer.FTPServer', None, *[], **kw)
+            serverfactory = Factory('ZServer.FTPServer', None,
+                                    module=self._module, ip=addr, port=port,
+                                    resolver=self._resolver,
+                                    logger_object=self._logger)
             l.append(serverfactory)
         return l
 
     def pcgi_server(self, section):
         if not self._read_only:
-            kw = make_dict(module=self._module,
-                           ip=self._default_ip, pcgi_file=section.file,
-                           resolver=self._resolver,
-                           logger_object=self._logger)
-            serverfactory = Factory('ZServer.PCGIServer', None, *[], **kw)
+            serverfactory = Factory('ZServer.PCGIServer', None,
+                                    module=self._module,
+                                    ip=self._default_ip,
+                                    pcgi_file=section.file,
+                                    resolver=self._resolver,
+                                    logger_object=self._logger)
             return [serverfactory]
         return []
 
@@ -299,10 +296,10 @@
             addr = port = None
         file = section.file
         if not self._read_only:
-            kw = make_dict(module=self._module, ip=addr, port=port,
-                           socket_file=file, resolver=self._resolver,
-                           logger_object=self._logger)
-            serverfactory = Factory('ZServer.FCGIServer', None, *[], **kw)
+            serverfactory = Factory('ZServer.FCGIServer', None,
+                                    module=self._module, ip=addr, port=port,
+                                    socket_file=file, resolver=self._resolver,
+                                    logger_object=self._logger)
             return [serverfactory]
         return []
 
@@ -314,9 +311,10 @@
             return []
         l = []
         for addr, port in section.ports:
-            kw = make_dict(password=self._pw, hostname=addr, port=port)
-            serverfactory = Factory(
-                'ZServer.secure_monitor_server', None, *[], **kw)
+            serverfactory = Factory('ZServer.secure_monitor_server', None,
+                                    password=self._pw,
+                                    hostname=addr,
+                                    port=port)
             l.append(serverfactory)
         return l
 
@@ -324,7 +322,7 @@
         l = []
         for addr, port in section.ports:
             serverfactory = Factory('ZServer.ICPServer.ICPServer', None,
-                                    *(addr, port), **{})
+                                    addr, port)
             l.append(serverfactory)
         return l
 
@@ -336,6 +334,3 @@
     root_handler = _RootHandler(options)
     handlers['root_handler'] = root_handler
     return multihandler(handlers)
-    
-def make_dict(**kw):
-    return kw