- Try checking for an "old style" security policy *after* we parse

  ZCML (thinko).

3 files changed, 15 insertions, 4 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 17af3da9d..6bb1a96d1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,12 @@
+0.9a4 (2009-05-27)
+==================
+
+Bug Fixes
+---------
+
+- Try checking for an "old style" security policy *after* we parse
+  ZCML (thinko).
+
 0.9a3 (2009-05-27)
 ==================
 
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
diff --git a/setup.py b/setup.py
index beb06113a..ba31e33e1 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 
-__version__ = '0.9a3'
+__version__ = '0.9a4'
 
 import os