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

[Michael Howitz]

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

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

-=-
Modified: zope.app.generations/trunk/CHANGES.txt
===================================================================
--- zope.app.generations/trunk/CHANGES.txt	2010-09-17 12:30:32 UTC (rev 116509)
+++ zope.app.generations/trunk/CHANGES.txt	2010-09-17 12:39:06 UTC (rev 116510)
@@ -12,7 +12,10 @@
 - Using python's ``doctest`` module instead of deprecated
   ``zope.testing.doctest[unit]``.
 
+- Replaced a testing dependency on ``zope.app.securitypolicy`` with one on
+  ``zope.securitypolicy``.
 
+
 3.5.1 (2010-01-08)
 ------------------
 

Modified: zope.app.generations/trunk/setup.py
===================================================================
--- zope.app.generations/trunk/setup.py	2010-09-17 12:30:32 UTC (rev 116509)
+++ zope.app.generations/trunk/setup.py	2010-09-17 12:39:06 UTC (rev 116510)
@@ -58,12 +58,13 @@
       packages=find_packages('src'),
       package_dir = {'': 'src'},
       namespace_packages=['zope', 'zope.app'],
-      extras_require = dict(test=['zope.app.testing',
-                                  'zope.app.securitypolicy',
-                                  'zope.app.zcmlfiles',
-                                  'zope.login',
-                                  'zope.publisher >= 3.12',
-                                  ]),
+      extras_require = dict(test=[
+          'zope.app.testing',
+          'zope.app.zcmlfiles',
+          'zope.login',
+          'zope.publisher >= 3.12',
+          'zope.securitypolicy',
+          ]),
       install_requires=['setuptools',
                         'zope.app.renderer',
                         'zope.interface',

Modified: zope.app.generations/trunk/src/zope/app/generations/ftesting.zcml
===================================================================
--- zope.app.generations/trunk/src/zope/app/generations/ftesting.zcml	2010-09-17 12:30:32 UTC (rev 116509)
+++ zope.app.generations/trunk/src/zope/app/generations/ftesting.zcml	2010-09-17 12:39:06 UTC (rev 116510)
@@ -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.login" />
 
   <securityPolicy
@@ -21,15 +21,7 @@
 
   <grantAll role="zope.Manager" />
 
-  <!-- Principal that tests generally run as -->
   <principal
-      id="zope.mgr"
-      title="Manager"
-      login="mgr"
-      password="mgrpw" />
-
-  <!-- Bootstrap principal used to make local grant to the principal above -->
-  <principal
       id="zope.globalmgr"
       title="Manager"
       login="globalmgr"