[z3-checkins] r20007 - in z3/Five/branch/Five-1.2: . tests

[efge at codespeak.net]

Author: efge
Date: Fri Nov 18 14:03:48 2005
New Revision: 20007

Modified:
   z3/Five/branch/Five-1.2/CHANGES.txt
   z3/Five/branch/Five-1.2/event.py
   z3/Five/branch/Five-1.2/tests/event.txt
   z3/Five/branch/Five-1.2/zcml.py
Log:
Fixed loops in zcml loading due to events in some cases, see

see
http://permalink.gmane.org/gmane.comp.web.zope.z3base.five/875
and
http://permalink.gmane.org/gmane.comp.web.zope.z3base.five/876



Modified: z3/Five/branch/Five-1.2/CHANGES.txt
==============================================================================
--- z3/Five/branch/Five-1.2/CHANGES.txt	(original)
+++ z3/Five/branch/Five-1.2/CHANGES.txt	Fri Nov 18 14:03:48 2005
@@ -60,6 +60,8 @@
 
 * Fixed some event recursion compatibility modes.
 
+* Fixed loops in zcml loading due to events in some cases.
+
 Five 1.2b (2005-11-02)
 ======================
 

Modified: z3/Five/branch/Five-1.2/event.py
==============================================================================
--- z3/Five/branch/Five-1.2/event.py	(original)
+++ z3/Five/branch/Five-1.2/event.py	Fri Nov 18 14:03:48 2005
@@ -586,7 +586,7 @@
     patchMethod(CatalogPathAwareness.CatalogAware, 'manage_afterClone',
                 CA_manage_afterClone)
 
-    zcml.load_config('event.zcml', Products.Five)
+    zcml.load_config('event.zcml', Products.Five, execute=False)
 
     addCleanUp(undoMonkies)
 

Modified: z3/Five/branch/Five-1.2/tests/event.txt
==============================================================================
--- z3/Five/branch/Five-1.2/tests/event.txt	(original)
+++ z3/Five/branch/Five-1.2/tests/event.txt	Fri Nov 18 14:03:48 2005
@@ -181,6 +181,7 @@
   >>> import Products.Five
   >>> zcml.load_config('meta.zcml', Products.Five)
   >>> zcml.load_config('interfaces.zcml', Products.Five)
+  >>> zcml.load_config('event.zcml', Products.Five)
 
 Now execute the directive enabling events::
 

Modified: z3/Five/branch/Five-1.2/zcml.py
==============================================================================
--- z3/Five/branch/Five-1.2/zcml.py	(original)
+++ z3/Five/branch/Five-1.2/zcml.py	Fri Nov 18 14:03:48 2005
@@ -41,13 +41,13 @@
     _context = xmlconfig.file(file)
 
 
-def load_config(file, package=None):
+def load_config(file, package=None, execute=True):
     """Load an additional ZCML file into the context.
 
     Use with extreme care.
     """
     global _context
-    _context = xmlconfig.file(file, package, _context)
+    _context = xmlconfig.file(file, package, _context, execute=execute)
 
 def load_string(s):
     """Load a snipped of ZCML into the context.