[Checkins] SVN: zope.app.container/trunk/ Replaced a testing dependency on zope.app.securitypolicy with one on the base zope.securitypolicy distribution.

[Hanno Schlichting]

Log message for revision 116373:
  Replaced a testing dependency on zope.app.securitypolicy with one on the base zope.securitypolicy distribution.
  

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

-=-
Modified: zope.app.container/trunk/CHANGES.txt
===================================================================
--- zope.app.container/trunk/CHANGES.txt	2010-09-14 11:22:58 UTC (rev 116372)
+++ zope.app.container/trunk/CHANGES.txt	2010-09-14 11:39:52 UTC (rev 116373)
@@ -5,7 +5,8 @@
 3.9.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Replaced a testing dependency on zope.app.securitypolicy with one on the base
+  zope.securitypolicy distribution.
 
 
 3.9.0 (2010-08-19)

Modified: zope.app.container/trunk/setup.py
===================================================================
--- zope.app.container/trunk/setup.py	2010-09-14 11:22:58 UTC (rev 116372)
+++ zope.app.container/trunk/setup.py	2010-09-14 11:39:52 UTC (rev 116373)
@@ -49,10 +49,10 @@
       namespace_packages=['zope', 'zope.app'],
 
       extras_require=dict(test=['zope.app.testing',
-                                'zope.app.securitypolicy',
                                 'zope.app.zcmlfiles',
                                 'zope.app.file',
                                 'zope.login',
+                                'zope.securitypolicy',
                                 ]),
       install_requires=['setuptools',
                         'zope.browser',

Modified: zope.app.container/trunk/src/zope/app/container/ftesting.zcml
===================================================================
--- zope.app.container/trunk/src/zope/app/container/ftesting.zcml	2010-09-14 11:22:58 UTC (rev 116372)
+++ zope.app.container/trunk/src/zope/app/container/ftesting.zcml	2010-09-14 11:39:52 UTC (rev 116373)
@@ -13,8 +13,7 @@
   <include package="zope.app.authentication" />
 
   <include package="zope.securitypolicy" file="meta.zcml" />
-  <include package="zope.app.securitypolicy.browser.tests" file="functional.zcml" />
-  <include package="zope.app.securitypolicy" />
+  <include package="zope.securitypolicy" />
   <include package="zope.login" />
 
   <securityPolicy
@@ -44,15 +43,6 @@
       title="Manager"
       login="mgr"
       password="mgrpw" />
+  <grant role="zope.Manager" principal="zope.mgr" />
 
-  <!-- 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.globalmgr" />
-
-
 </configure>