summaryrefslogtreecommitdiff
path: root/repoze/bfg/settings.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-07-02 07:15:44 +0000
committerChris McDonough <chrism@agendaless.com>2009-07-02 07:15:44 +0000
commit1eb861e0f046397715a92ed7ad7b85a2baa22b29 (patch)
treefb38becdf9654925f1ec92b5998e2da53678f508 /repoze/bfg/settings.py
parent0af38fb5dd7c59fb0ce185edd76064b3db4cabdd (diff)
downloadpyramid-1eb861e0f046397715a92ed7ad7b85a2baa22b29.tar.gz
pyramid-1eb861e0f046397715a92ed7ad7b85a2baa22b29.tar.bz2
pyramid-1eb861e0f046397715a92ed7ad7b85a2baa22b29.zip
- Allow a Paste config file (``configure_zcml``) value or an
environment variable (``BFG_CONFIGURE_ZCML``) to name a ZCML file that will be used to bootstrap the application. Previously, the integrator could not influence which ZCML file was used to do the boostrapping (only the original application developer could do so).
Diffstat (limited to 'repoze/bfg/settings.py')
-rw-r--r--repoze/bfg/settings.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/repoze/bfg/settings.py b/repoze/bfg/settings.py
index 08607f756..57295fcdc 100644
--- a/repoze/bfg/settings.py
+++ b/repoze/bfg/settings.py
@@ -55,11 +55,14 @@ def get_options(kw, environ=os.environ):
config_reload_resources = kw.get('reload_resources', '')
effective_reload_resources = asbool(eget('BFG_RELOAD_RESOURCES',
config_reload_resources))
+ configure_zcml = kw.get('configure_zcml', '')
+ effective_configure_zcml = eget('BFG_CONFIGURE_ZCML', configure_zcml)
update = {
'debug_authorization': effective_debug_all or effective_debug_auth,
'debug_notfound': effective_debug_all or effective_debug_notfound,
'reload_templates': effective_reload_all or effective_reload_templates,
'reload_resources':effective_reload_all or effective_reload_resources,
+ 'configure_zcml':effective_configure_zcml,
}
kw.update(update)