From d17ecbf8fef39cd41398ab64b3cadeb7aed65f56 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Tue, 7 Dec 2010 22:04:56 -0500
Subject: implement load_zcml in terms of a configurator

---
 pyramid/zcml.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pyramid/zcml.py b/pyramid/zcml.py
index d0db53bee..3c385742e 100644
--- a/pyramid/zcml.py
+++ b/pyramid/zcml.py
@@ -754,13 +754,12 @@ def zcml_configure(name, package):
     ZCML into the current ZCML registry.
 
     """
-    context = ConfigurationMachine()
-    xmlconfig.registerCommonDirectives(context)
-    context.package = package
-    context.registry = get_current_registry()
-    xmlconfig.include(context, name, package)
-    context.execute_actions(clear=False) # the raison d'etre
-    return context.actions
+    registry = get_current_registry()
+    configurator = Configurator(registry=registry, package=package)
+    configurator.load_zcml(name)
+    actions = configurator._ctx.actions[:]
+    configurator.commit()
+    return actions
 
 file_configure = zcml_configure # backwards compat (>0.8.1)
 
-- 
cgit v1.2.3