[Checkins] SVN: zope.app.component/trunk/ Replaced a testing dependency on zope.app.securitypolicy with one on zope.securitypolicy.

[Michael Howitz]

Log message for revision 116514:
  Replaced a testing dependency on zope.app.securitypolicy with one on zope.securitypolicy.
  

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

-=-
Modified: zope.app.component/trunk/CHANGES.txt
===================================================================
--- zope.app.component/trunk/CHANGES.txt	2010-09-17 12:40:25 UTC (rev 116513)
+++ zope.app.component/trunk/CHANGES.txt	2010-09-17 12:45:34 UTC (rev 116514)
@@ -5,7 +5,8 @@
 3.9.2 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Replaced a testing dependency on ``zope.app.securitypolicy`` with one on
+  ``zope.securitypolicy``.
 
 
 3.9.1 (2010-09-01)
@@ -14,7 +15,7 @@
 - No longer using deprecated ``zope.testing.doctest``. Use python's build-in
   ``doctest`` instead.
 
-- Replaced the dependency on zope.deferredimport with BBB imports
+- Replaced the dependency on ``zope.deferredimport`` with BBB imports.
 
 
 3.9.0 (2010-07-19)

Modified: zope.app.component/trunk/setup.py
===================================================================
--- zope.app.component/trunk/setup.py	2010-09-17 12:40:25 UTC (rev 116513)
+++ zope.app.component/trunk/setup.py	2010-09-17 12:45:34 UTC (rev 116514)
@@ -53,12 +53,13 @@
       package_dir={'': 'src'},
       namespace_packages=['zope', 'zope.app'],
       extras_require=dict(
-          test=['zope.app.testing',
-                'zope.app.securitypolicy',
-                'zope.app.zcmlfiles',
-                'zope.app.schema',
-                'zope.testbrowser',
-                'zope.login',
+          test=[
+              'zope.app.schema',
+              'zope.app.testing',
+              'zope.app.zcmlfiles',
+              'zope.login',
+              'zope.securitypolicy',
+              'zope.testbrowser',
                 ]),
       install_requires=[
           'setuptools',

Modified: zope.app.component/trunk/src/zope/app/component/ftesting.zcml
===================================================================
--- zope.app.component/trunk/src/zope/app/component/ftesting.zcml	2010-09-17 12:40:25 UTC (rev 116513)
+++ zope.app.component/trunk/src/zope/app/component/ftesting.zcml	2010-09-17 12:45:34 UTC (rev 116514)
@@ -11,7 +11,7 @@
 
   <include package="zope.app.zcmlfiles" />
   <include package="zope.app.authentication" />
-  <include package="zope.app.securitypolicy" />
+  <include package="zope.securitypolicy" />
   <include package="zope.formlib" />
   <include package="zope.login" />
 
@@ -21,7 +21,6 @@
   <role id="zope.Manager" title="Site Manager" />
 
   <grantAll role="zope.Manager" />
-  <include package="zope.app.securitypolicy.browser.tests" file="functional.zcml" />
 
   <!-- Principal that tests generally run as -->
   <principal
@@ -30,13 +29,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>