[Zope-Checkins] CVS: Zope/lib/python/Startup - datatypes.py:1.4 zopeschema.xml:1.4

Chris McDonough chrism@zope.com
Sat, 4 Jan 2003 14:30:56 -0500


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

Modified Files:
	datatypes.py zopeschema.xml 
Log Message:
Merge chrism-install-branch changes into HEAD.


=== Zope/lib/python/Startup/datatypes.py 1.3 => 1.4 ===
--- Zope/lib/python/Startup/datatypes.py:1.3	Fri Jan  3 00:46:18 2003
+++ Zope/lib/python/Startup/datatypes.py	Sat Jan  4 14:30:51 2003
@@ -50,15 +50,13 @@
     dateformat = section.dateformat
     level      = section.level
 
-    formatter = Factory('logging.Formatter', None,
-                        *[format, dateformat], **{})
+    formatter = Factory('logging.Formatter', None, format, dateformat)
 
     def callback(inst, formatter=formatter, level=level):
         inst.setFormatter(formatter())
         inst.setLevel(level)
 
-    return Factory('zLOG.LogHandlers.FileHandler', callback,
-                   *[file], **{})
+    return Factory('zLOG.LogHandlers.FileHandler', callback, file)
 
 def syslog_facility(value):
     d = {
@@ -104,8 +102,7 @@
         raise ValueError, ('One of "socket" or "host" must be '
                            'specified in a syslog_handler section')
         
-    formatter = Factory('logging.Formatter', None,
-                        *[format, dateformat], **{})
+    formatter = Factory('logging.Formatter', None, format, dateformat)
 
     def callback(inst, formatter=formatter, level=level):
         inst.setFormatter(formatter())
@@ -113,10 +110,9 @@
 
     klass = 'zLOG.LogHandlers.SysLogHandler'
     if socket:
-        handler = Factory(klass, callback, *[socket, facility], **{})
+        handler = Factory(klass, callback, socket, facility)
     else:
-        handler = Factory(klass, callback, *[(host, port), facility],
-                          **{})
+        handler = Factory(klass, callback, (host, port), facility)
 
     return handler
 
@@ -126,15 +122,13 @@
     dateformat = section.dateformat
     level = section.level
     
-    formatter = Factory('logging.Formatter', None,
-                        *[format, dateformat], **{})
+    formatter = Factory('logging.Formatter', None, format, dateformat)
 
     def callback(inst, formatter=formatter, level=level):
         inst.setFormatter(formatter())
         inst.setLevel(level)
 
-    return Factory('zLOG.LogHandlers.NTEventLogHandler', callback, *[appname],
-                   **{})
+    return Factory('zLOG.LogHandlers.NTEventLogHandler', callback, appname)
 
 def http_handler_url(value):
     import urlparse
@@ -168,15 +162,13 @@
     dateformat = section.dateformat
     level      = section.level
     
-    formatter = Factory('logging.Formatter', None,
-                        *[format, dateformat], **{})
+    formatter = Factory('logging.Formatter', None, format, dateformat)
 
     def callback(inst, formatter=formatter, level=level):
         inst.setFormatter(formatter())
         inst.setLevel(level)
 
-    return Factory('zLOG.LogHandlers.HTTPHandler', callback,
-                   *[host, url, method], **{})
+    return Factory('zLOG.LogHandlers.HTTPHandler', callback, host, url, method)
 
 def smtp_handler(section):
     fromaddr   = section.fromaddr
@@ -191,15 +183,14 @@
         mailhost = host
     else:
         mailhost = host, port
-    formatter = Factory('logging.Formatter', None,
-                        *[format, dateformat], **{})
+    formatter = Factory('logging.Formatter', None, format, dateformat)
 
     def callback(inst, formatter=formatter, level=level):
         inst.setFormatter(formatter())
         inst.setLevel(level)
 
     return Factory('zLOG.LogHandlers.SMTPHandler', callback,
-                   *[mailhost, fromaddr, toaddrs, subject], **{})
+                   mailhost, fromaddr, toaddrs, subject)
 
 def null_handler(section):
     return Factory('zLOG.LogHandlers.NullHandler', None)
@@ -218,7 +209,9 @@
     return Factory(handler_klass, callback, *handler_pos, **handler_kw)
 
 def logger(section):
-    return LoggerWrapper(section.__name__, section.level, section.handlers)
+    return LoggerWrapper(section.getSectionName(),
+                         section.level,
+                         section.handlers)
 
 # database-related datatypes
 
@@ -237,15 +230,14 @@
         raise ValueError, 'Must name one storage in a database section'
     klass = section.db_class
     mounts = section.mount_points
-    kwargs = {
-        'pool_size':section.pool_size,
-        'cache_size':section.cache_size,
-        'cache_deactivate_after':section.cache_deactivate_after,
-        'version_pool_size':section.version_pool_size,
-        'version_cache_size':section.version_cache_size,
-        'version_cache_deactivate_after':section.version_cache_deactivate_after,
-        }
-    dbfactory = Factory(klass, None, *[], **kwargs)
+    dbfactory = Factory(
+        klass, None,
+        pool_size=section.pool_size,
+        cache_size=section.cache_size,
+        cache_deactivate_after=section.cache_deactivate_after,
+        version_pool_size=section.version_pool_size,
+        version_cache_size=section.version_cache_size,
+        version_cache_deactivate_after=section.version_cache_deactivate_after)
     storagefactory = section.storages[0]
     return mounts, DBWrapper(dbfactory, storagefactory)
 
@@ -257,11 +249,11 @@
         'stop':section.stop,
         'quota':section.quota,
         }
-    return Factory('ZODB.FileStorage.FileStorage', None, *[file_name], **kw)
+    return Factory('ZODB.FileStorage.FileStorage', None, file_name, **kw)
 
 def mappingstorage(section):
     name = section.name
-    return Factory('ZODB.MappingStorage.MappingStorage', None, *[name], **{})
+    return Factory('ZODB.MappingStorage.MappingStorage', None, name)
 
 def clientstorage(section):
     addr = section.addr
@@ -278,7 +270,7 @@
         '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, addr, **kw)
 
 _marker = []
 
@@ -333,6 +325,3 @@
             self.dbfactory.setArgs(args, kw)
             self.resolved = self.dbfactory()
         return self.resolved
-
-def make_dict(**kw):
-    return kw


=== Zope/lib/python/Startup/zopeschema.xml 1.3 => 1.4 ===
--- Zope/lib/python/Startup/zopeschema.xml:1.3	Fri Jan  3 00:46:18 2003
+++ Zope/lib/python/Startup/zopeschema.xml	Sat Jan  4 14:30:51 2003
@@ -106,23 +106,23 @@
   <sectiongroup type="storage">
 
     <sectiontype type="filestorage" datatype=".filestorage">
-      <key name="file_name" datatype="str" required="yes"/>
+      <key name="file_name" required="yes"/>
       <key name="create" datatype="boolean"/>
       <key name="read_only" datatype="boolean"/>
-      <key name="stop" datatype="str"/>
+      <key name="stop"/>
       <key name="quota" datatype="integer"/>
     </sectiontype>
 
     <sectiontype type="mappingstorage" datatype=".mappingstorage">
-      <key name="name" datatype="str" default="Mapping Storage"/>
+      <key name="name" default="Mapping Storage"/>
     </sectiontype>
 
     <sectiontype type="clientstorage" datatype=".clientstorage">
       <key name="addr" datatype="inet-address" required="yes"/>
-      <key name="storage" datatype="str" default="1"/>
+      <key name="storage" default="1"/>
       <key name="cache_size" datatype="integer" default="20000000"/>
-      <key name="name" datatype="str" default=""/>
-      <key name="client" datatype="str"/>
+      <key name="name" default=""/>
+      <key name="client"/>
       <key name="debug" datatype="boolean"/>
       <key name="var" datatype="existing-directory"/>
       <key name="min_disconnect_poll" datatype="integer" default="5"/>
@@ -139,7 +139,7 @@
       <multisection type="storage" name="*" attribute="storages"/>
       <multikey name="mount_point" attribute="mount_points"
                 datatype=".mount_point"/>
-      <key name="db_class" datatype="str" default="ZODB.DB"/>
+      <key name="db_class" default="ZODB.DB"/>
       <key name="cache_size" datatype="integer" default="5000"/>
       <key name="pool_size" datatype="integer" default="7"/>
       <key name="cache_deactivate_after" datatype="integer" default="60"/>
@@ -171,7 +171,7 @@
   <key name="debug_mode" datatype="boolean" default="on"
        handler="debug_mode"/>
 
-  <key name="effective_user" datatype="str"/>
+  <key name="effective_user"/>
 
   <key name="enable_product_installation" datatype="boolean" default="on"
        handler="enable_product_installation"/>
@@ -194,10 +194,9 @@
   <key name="maximum_security_manager_stack_size" datatype="integer"
        default="100" handler="maximum_security_manager_stack_size"/>
 
-  <key name="publisher_profile_file" datatype="str"
-       handler="publisher_profile_file"/>
+  <key name="publisher_profile_file" handler="publisher_profile_file"/>
 
-  <key name="webdav_source_user_agents" datatype="str"/>
+  <key name="webdav_source_user_agents"/>
 
   <multikey name="cgi_environment_variable" datatype="key-value"
        attribute="cgi_environment_variables"/>
@@ -206,7 +205,7 @@
 
   <key name="ip_address" datatype="ipaddr-or-hostname"/>
 
-  <key name="http_realm" datatype="str" default="Zope" handler="http_realm"/>
+  <key name="http_realm" default="Zope" handler="http_realm"/>
 
   <key name="automatically_quote_dtml_request_data" datatype="boolean"
      default="on" handler="automatically_quote_dtml_request_data"/>
@@ -224,10 +223,10 @@
   <key name="maximum_number_of_session_objects" datatype="integer"
      default="1000" handler="maximum_number_of_session_objects"/>
 
-  <key name="session_add_notify_script_path" datatype="str"
+  <key name="session_add_notify_script_path"
        handler="session_add_notify_script_path"/>
 
-  <key name="session_delete_notify_script_path" datatype="str"
+  <key name="session_delete_notify_script_path"
        handler="session_add_notify_script_path"/>
 
   <key name="session_timeout_minutes" datatype="integer"
@@ -245,7 +244,7 @@
   <key name="read_only_database" datatype="boolean"
      handler="read_only_database"/>
 
-  <key name="zeo_client_name" datatype="str"
+  <key name="zeo_client_name"
      handler="zeo_client_name"/>
 
   <section type="logger" name="event"/>