diff options
| author | Chris McDonough <chrism@plope.com> | 2010-12-07 22:04:56 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-12-07 22:04:56 -0500 |
| commit | d17ecbf8fef39cd41398ab64b3cadeb7aed65f56 (patch) | |
| tree | 56b1b66368e199e22e463eafdf3cc32b6bc9c095 | |
| parent | 6c436f0dca26f8b25456aeaca8c1daa6bef2e84e (diff) | |
| download | pyramid-d17ecbf8fef39cd41398ab64b3cadeb7aed65f56.tar.gz pyramid-d17ecbf8fef39cd41398ab64b3cadeb7aed65f56.tar.bz2 pyramid-d17ecbf8fef39cd41398ab64b3cadeb7aed65f56.zip | |
implement load_zcml in terms of a configurator
| -rw-r--r-- | pyramid/zcml.py | 13 |
1 files 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) |