[Checkins] SVN: zope.app.exception/trunk/ - Replaced dependency on ``zope.app.securitypolicy`` by ``zope.securitypolicy``.

[Michael Howitz]

Log message for revision 116383:
  - Replaced dependency on ``zope.app.securitypolicy`` by ``zope.securitypolicy``.
  

Changed:
  U   zope.app.exception/trunk/CHANGES.txt
  U   zope.app.exception/trunk/setup.py
  U   zope.app.exception/trunk/src/zope/app/exception/ftesting.zcml

-=-
Modified: zope.app.exception/trunk/CHANGES.txt
===================================================================
--- zope.app.exception/trunk/CHANGES.txt	2010-09-14 13:15:40 UTC (rev 116382)
+++ zope.app.exception/trunk/CHANGES.txt	2010-09-14 13:27:20 UTC (rev 116383)
@@ -6,7 +6,10 @@
 
 - No longer depend on ``zope.app.zptpage`` for tests.
 
+- Replaced dependency on ``zope.app.securitypolicy`` by
+  ``zope.securitypolicy``.
 
+
 3.6.1 (2010-01-08)
 ------------------
 

Modified: zope.app.exception/trunk/setup.py
===================================================================
--- zope.app.exception/trunk/setup.py	2010-09-14 13:15:40 UTC (rev 116382)
+++ zope.app.exception/trunk/setup.py	2010-09-14 13:27:20 UTC (rev 116383)
@@ -59,10 +59,10 @@
       package_dir = {'': 'src'},
       namespace_packages=['zope', 'zope.app'],
       extras_require=dict(test=[
-          'zope.app.securitypolicy',
           'zope.app.testing',
           'zope.app.zcmlfiles',
           'zope.login',
+          'zope.securitypolicy',
       ]),
       install_requires=['setuptools',
                         'zope.interface',

Modified: zope.app.exception/trunk/src/zope/app/exception/ftesting.zcml
===================================================================
--- zope.app.exception/trunk/src/zope/app/exception/ftesting.zcml	2010-09-14 13:15:40 UTC (rev 116382)
+++ zope.app.exception/trunk/src/zope/app/exception/ftesting.zcml	2010-09-14 13:27:20 UTC (rev 116383)
@@ -12,7 +12,7 @@
 
   <include package="zope.app.zcmlfiles" />
   <include package="zope.app.authentication" />
-  <include package="zope.app.securitypolicy" />
+  <include package="zope.securitypolicy" />
   <include package="zope.login" />
 
   <browser:page
@@ -42,8 +42,6 @@
 
   <grantAll role="zope.Manager" />
 
-  <include package="zope.app.securitypolicy.browser.tests" file="functional.zcml" />
-
   <!-- Principals -->
 
   <unauthenticatedPrincipal
@@ -57,13 +55,6 @@
       login="mgr"
       password="mgrpw" />
 
-  <!-- Bootstrap principal used to make local grant to the principal above -->
-  <principal
-      id="zope.globalmgr"
-      title="Manager"
-      login="globalmgr"
-      password="globalmgrpw" />
+  <grant role="zope.Manager" principal="zope.mgr" />
 
-  <grant role="zope.Manager" principal="zope.globalmgr" />
-
 </configure>