[z3-checkins] r20009 - z3/Five/trunk

[efge at codespeak.net]

Author: efge
Date: Fri Nov 18 14:09:32 2005
New Revision: 20009

Modified:
   z3/Five/trunk/zcml.py
Log:
Merge from 1.2 branch: allow loading config without executing.

Modified: z3/Five/trunk/zcml.py
==============================================================================
--- z3/Five/trunk/zcml.py	(original)
+++ z3/Five/trunk/zcml.py	Fri Nov 18 14:09:32 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.