[Zope-Checkins] CVS: Zope/lib/python/Zope/Startup - datatypes.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-serv17702

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


=== Zope/lib/python/Zope/Startup/datatypes.py 1.1.2.4 => 1.1.2.5 ===
--- Zope/lib/python/Zope/Startup/datatypes.py:1.1.2.4	Fri Jan 24 18:28:49 2003
+++ Zope/lib/python/Zope/Startup/datatypes.py	Tue Jan 28 14:50:26 2003
@@ -58,34 +58,29 @@
     return mounts, DBWrapper(dbfactory, storagefactory)
 
 def filestorage(section):
-    kw = {
-        'create':section.create,
-        'read_only':section.read_only,
-        'stop':section.stop,
-        'quota':section.quota,
-        }
-    return Factory('ZODB.FileStorage.FileStorage', None, section.path, **kw)
+    return Factory('ZODB.FileStorage.FileStorage', None, section.path,
+                   create=section.create,
+                   read_only=section.read_only,
+                   stop=section.stop,
+                   quota=section.quota)
 
 def mappingstorage(section):
     name = section.name
     return Factory('ZODB.MappingStorage.MappingStorage', None, name)
 
 def clientstorage(section):
-    addr = section.addr
-    kw = {
-        'storage':section.create,
-        'cache_size':section.read_only,
-        'name':section.stop,
-        'client':section.quota,
-        'debug':section.quota,
-        'var':section.quota,
-        'min_disconnect_poll':section.quota,
-        'max_disconnect_poll':section.quota,
-        'wait':section.wait,
-        'read_only':section.read_only,
-        'read_only_fallback':section.read_only_fallback,
-        }
-    return Factory('ZEO.ClientStorage.ClientStorage', None, addr, **kw)
+    return Factory('ZEO.ClientStorage.ClientStorage', None, section.addr,
+                   storage=section.storage,
+                   cache_size=section.cache_size,
+                   name=section.name,
+                   client=section.client,
+                   debug=section.debug,
+                   var=section.var,
+                   min_disconnect_poll=section.min_disconnect_poll,
+                   max_disconnect_poll=section.max_disconnect_poll,
+                   wait=section.wait,
+                   read_only=section.read_only,
+                   read_only_fallback=section.read_only_fallback)
 
 _marker = object()
 
@@ -135,7 +130,7 @@
 
     def __call__(self):
         if self.resolved is _marker:
-            args, kw= self.dbfactory.getArgs()
+            args, kw = self.dbfactory.getArgs()
             args = [self.storagefactory()] + list(args)
             self.dbfactory.setArgs(args, kw)
             self.resolved = self.dbfactory()