summaryrefslogtreecommitdiff
path: root/repoze
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-05-28 00:39:40 +0000
committerChris McDonough <chrism@agendaless.com>2009-05-28 00:39:40 +0000
commit5968cd6ab617d6b25a43cd3bd3866d4a8f635638 (patch)
tree429c92a7c1f87ed71b680e5c3ee4f982e2716727 /repoze
parent66b0d01d9b6cfabe0f724a42145e174afcc5315a (diff)
downloadpyramid-5968cd6ab617d6b25a43cd3bd3866d4a8f635638.tar.gz
pyramid-5968cd6ab617d6b25a43cd3bd3866d4a8f635638.tar.bz2
pyramid-5968cd6ab617d6b25a43cd3bd3866d4a8f635638.zip
- Try checking for an "old style" security policy *after* we parse
ZCML (thinko).
Diffstat (limited to 'repoze')
-rw-r--r--repoze/bfg/router.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/repoze/bfg/router.py b/repoze/bfg/router.py
index 92fc5b58a..8549c63da 100644
--- a/repoze/bfg/router.py
+++ b/repoze/bfg/router.py
@@ -331,7 +331,10 @@ def make_app(root_factory, package=None, filename='configure.zcml',
if authorization_policy is None:
authorization_policy = ACLAuthorizationPolicy()
registry.registerUtility(authorization_policy, IAuthorizationPolicy)
- else:
+
+ populateRegistry(registry, filename, package)
+
+ if not authentication_policy:
# deal with bw compat of <= 0.8 security policies (deprecated)
secpol = registry.queryUtility(ISecurityPolicy)
if secpol is not None:
@@ -345,8 +348,7 @@ def make_app(root_factory, package=None, filename='configure.zcml',
'security policies will cease to work in a later BFG '
'release.')
registerBBBAuthn(secpol, registry)
-
- populateRegistry(registry, filename, package)
+
if mapper.has_routes():
# if the user had any <route/> statements in his configuration,
# use the RoutesRootFactory as the root factory