From 5968cd6ab617d6b25a43cd3bd3866d4a8f635638 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 28 May 2009 00:39:40 +0000 Subject: - Try checking for an "old style" security policy *after* we parse ZCML (thinko). --- repoze/bfg/router.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'repoze') 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 statements in his configuration, # use the RoutesRootFactory as the root factory -- cgit v1.2.3