[Checkins] SVN: zope.app.wsgi/trunk/ Merge changes from ulif_product_configs branch.

Uli Fouquet uli at gnufix.de
Tue Aug 25 04:08:22 EDT 2009


Log message for revision 103184:
  Merge changes from ulif_product_configs branch.

Changed:
  U   zope.app.wsgi/trunk/CHANGES.txt
  U   zope.app.wsgi/trunk/src/zope/app/wsgi/README.txt
  U   zope.app.wsgi/trunk/src/zope/app/wsgi/__init__.py

-=-
Modified: zope.app.wsgi/trunk/CHANGES.txt
===================================================================
--- zope.app.wsgi/trunk/CHANGES.txt	2009-08-25 07:38:43 UTC (rev 103183)
+++ zope.app.wsgi/trunk/CHANGES.txt	2009-08-25 08:08:22 UTC (rev 103184)
@@ -5,7 +5,7 @@
 3.6.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Support product configuration sections in Zope configuration files.
 
 
 3.6.0 (2009-06-20)

Modified: zope.app.wsgi/trunk/src/zope/app/wsgi/README.txt
===================================================================
--- zope.app.wsgi/trunk/src/zope/app/wsgi/README.txt	2009-08-25 07:38:43 UTC (rev 103183)
+++ zope.app.wsgi/trunk/src/zope/app/wsgi/README.txt	2009-08-25 08:08:22 UTC (rev 103184)
@@ -170,6 +170,10 @@
   ...     path STDOUT
   ...   </logfile>
   ... </eventlog>
+  ...
+  ... <product-config sample>
+  ...   key1 val1
+  ... </product-config>
   ... ''' %sitezcml)
 
 
@@ -193,6 +197,12 @@
   >>> called[0].application is app
   True
 
+The product configs were parsed:
+
+  >>> import zope.app.appsetup.product as zapp
+  >>> print zapp.getProductConfiguration('sample')
+  {'key1': 'val1'}
+
   >>> import shutil
   >>> shutil.rmtree(temp_dir)
 

Modified: zope.app.wsgi/trunk/src/zope/app/wsgi/__init__.py
===================================================================
--- zope.app.wsgi/trunk/src/zope/app/wsgi/__init__.py	2009-08-25 07:38:43 UTC (rev 103183)
+++ zope.app.wsgi/trunk/src/zope/app/wsgi/__init__.py	2009-08-25 08:08:22 UTC (rev 103184)
@@ -20,6 +20,7 @@
 import logging
 import ZConfig
 import zope.processlifetime
+import zope.app.appsetup.product
 
 from zope.event import notify
 from zope.interface import implements
@@ -126,6 +127,10 @@
     if options.path:
         sys.path[:0] = [os.path.abspath(p) for p in options.path]
 
+    # Parse product configs
+    zope.app.appsetup.product.setProductConfigurations(
+        options.product_config)
+    
     # Setup the event log
     options.eventlog()
 



More information about the Checkins mailing list