[Zope-Checkins] CVS: Packages/Startup - datatypes.py:1.3.2.2 zopeschema.xml:1.3.2.1

[Chris McDonough]

Update of /cvs-repository/Packages/Startup
In directory cvs.zope.org:/tmp/cvs-serv29689

Modified Files:
      Tag: chrism-install-branch
	datatypes.py zopeschema.xml 
Log Message:
Compatibility with trunk ZConfig.


=== Packages/Startup/datatypes.py 1.3.2.1 => 1.3.2.2 ===
--- Packages/Startup/datatypes.py:1.3.2.1	Fri Jan  3 11:01:39 2003
+++ Packages/Startup/datatypes.py	Sat Jan  4 14:28:19 2003
@@ -209,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
 


=== Packages/Startup/zopeschema.xml 1.3 => 1.3.2.1 ===
--- Packages/Startup/zopeschema.xml:1.3	Fri Jan  3 00:46:18 2003
+++ Packages/Startup/zopeschema.xml	Sat Jan  4 14:28:19 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"/>