[Zope-Checkins] SVN: Zope/branches/ajung-2-11-prep-branch/lib/python/ Update to zdaemon 2.0.1, and adapt startup code to fit.

[Tres Seaver]

Log message for revision 82433:
  Update to zdaemon 2.0.1, and adapt startup code to fit.
  
  o Also, use tagged release of ZODB-based externals.
  

Changed:
  _U  Zope/branches/ajung-2-11-prep-branch/lib/python/
  U   Zope/branches/ajung-2-11-prep-branch/lib/python/Zope2/Startup/datatypes.py

-=-

Property changes on: Zope/branches/ajung-2-11-prep-branch/lib/python
___________________________________________________________________
Name: svn:externals
   - # warning: KGS incomplete, using old URL for BTrees
BTrees               svn://svn.zope.org/repos/main/ZODB/branches/3.8/src/BTrees
ClientForm         svn://svn.zope.org/repos/main/Zope3/trunk/src/ClientForm
RestrictedPython     svn://svn.zope.org/repos/main/RestrictedPython/tags/3.4.2/src/RestrictedPython
# warning: KGS incomplete, using old URL for ThreadedAsync
ThreadedAsync        svn://svn.zope.org/repos/main/ZODB/branches/3.8/src/ThreadedAsync
ZConfig            svn://svn.zope.org/repos/main/ZConfig/tags/2.5/ZConfig
# warning: KGS incomplete, using old URL for ZEO
ZEO                  svn://svn.zope.org/repos/main/ZODB/branches/3.8/src/ZEO
# warning: KGS incomplete, using old URL for ZODB
ZODB                 svn://svn.zope.org/repos/main/ZODB/branches/3.8/src/ZODB
# warning: KGS incomplete, using old URL for ZopeUndo
ZopeUndo             svn://svn.zope.org/repos/main/ZODB/branches/3.8/src/ZopeUndo
docutils             svn://svn.zope.org/repos/main/docutils/tags/0.4.0
mechanize          svn://svn.zope.org/repos/main/Zope3/trunk/src/mechanize
# warning: KGS incomplete, using old URL for persistent
persistent           svn://svn.zope.org/repos/main/ZODB/branches/3.8/src/persistent
pytz               svn://svn.zope.org/repos/main/Zope3/trunk/src/pytz
# warning: KGS incomplete, using old URL for transaction
transaction          svn://svn.zope.org/repos/main/ZODB/branches/3.8/src/transaction
zdaemon              -r 40792 svn://svn.zope.org/repos/main/zdaemon/trunk/src/zdaemon
zodbcode             svn://svn.zope.org/repos/main/zodbcode/tags/3.4.0/src/zodbcode

   + # warning: KGS incomplete, using old URL for BTrees
BTrees               svn://svn.zope.org/repos/main/ZODB/tags/3.8.0c1/src/BTrees
ClientForm         svn://svn.zope.org/repos/main/Zope3/trunk/src/ClientForm
RestrictedPython     svn://svn.zope.org/repos/main/RestrictedPython/tags/3.4.2/src/RestrictedPython
# warning: KGS incomplete, using old URL for ThreadedAsync
ThreadedAsync        svn://svn.zope.org/repos/main/ZODB/tags/3.8.0c1/src/ThreadedAsync
ZConfig            svn://svn.zope.org/repos/main/ZConfig/tags/2.5/ZConfig
# warning: KGS incomplete, using old URL for ZEO
ZEO                  svn://svn.zope.org/repos/main/ZODB/tags/3.8.0c1/src/ZEO
# warning: KGS incomplete, using old URL for ZODB
ZODB                 svn://svn.zope.org/repos/main/ZODB/tags/3.8.0c1/src/ZODB
# warning: KGS incomplete, using old URL for ZopeUndo
ZopeUndo             svn://svn.zope.org/repos/main/ZODB/tags/3.8.0c1/src/ZopeUndo
docutils             svn://svn.zope.org/repos/main/docutils/tags/0.4.0
mechanize          svn://svn.zope.org/repos/main/Zope3/trunk/src/mechanize
# warning: KGS incomplete, using old URL for persistent
persistent           svn://svn.zope.org/repos/main/ZODB/tags/3.8.0c1/src/persistent
pytz               svn://svn.zope.org/repos/main/Zope3/trunk/src/pytz
# warning: KGS incomplete, using old URL for transaction
transaction          svn://svn.zope.org/repos/main/ZODB/tags/3.8.0c1/src/transaction
zdaemon              svn://svn.zope.org/repos/main/zdaemon/tags/2.0.1/src/zdaemon
zodbcode             svn://svn.zope.org/repos/main/zodbcode/tags/3.4.0/src/zodbcode


Modified: Zope/branches/ajung-2-11-prep-branch/lib/python/Zope2/Startup/datatypes.py
===================================================================
--- Zope/branches/ajung-2-11-prep-branch/lib/python/Zope2/Startup/datatypes.py	2007-12-24 16:33:08 UTC (rev 82432)
+++ Zope/branches/ajung-2-11-prep-branch/lib/python/Zope2/Startup/datatypes.py	2007-12-24 17:45:07 UTC (rev 82433)
@@ -15,6 +15,7 @@
 """Datatypes for the Zope schema for use with ZConfig."""
 
 import os
+from UserDict import UserDict
 
 from ZConfig.components.logger import logger
 from ZODB.config import ZODBDatabase
@@ -108,6 +109,13 @@
     ob = importable_name(name) # will fail in course
     return name
 
+
+class zdaemonEnvironDict(UserDict):
+    # zdaeomon 2 expects to use a 'mapping' attribute of the environ object.
+    @property
+    def mapping(self):
+        return self.data
+
 # Datatype for the root configuration object
 # (adds the softwarehome and zopehome fields; default values for some
 #  computed paths, configures the dbtab)
@@ -120,9 +128,9 @@
     section.softwarehome = swhome
     section.zopehome = os.path.dirname(os.path.dirname(swhome))
     if section.environment is None:
-        section.environment = {}
+        section.environment = zdaemonEnvironDict()
     if section.cgi_environment is None:
-        section.cgi_environment = {}
+        section.cgi_environment = zdaemonEnvironDict()
     if section.clienthome is None:
         section.clienthome = os.path.join(section.instancehome, "var")
     # set up defaults for pid_filename and lock_filename if they're