[Checkins] SVN: grok/trunk/ finish the move from zope.app.securitypolicy to zope.securitypolicy (zope.securitypolicy was only being pulled in from the install_requires dependency of zope.app.securitypolicy)

[Kevin Teague]

Log message for revision 83676:
  finish the move from zope.app.securitypolicy to zope.securitypolicy (zope.securitypolicy was only being pulled in from the install_requires dependency of zope.app.securitypolicy)

Changed:
  U   grok/trunk/CHANGES.txt
  U   grok/trunk/setup.py
  U   grok/trunk/src/grok/configure.zcml
  D   grok/trunk/src/grok/ftests/security/grant.py
  U   grok/trunk/versions.cfg

-=-
Modified: grok/trunk/CHANGES.txt
===================================================================
--- grok/trunk/CHANGES.txt	2008-02-08 20:04:49 UTC (rev 83675)
+++ grok/trunk/CHANGES.txt	2008-02-09 10:13:22 UTC (rev 83676)
@@ -55,6 +55,9 @@
 
 * Refactor commonalities out of meta.py.
 
+* zope.app.securitypolicy is no longer used. zope.securitypolicy provides
+  all securitypolicy features used by Grok.
+
 0.11 (2007-11-08)
 =================
 

Modified: grok/trunk/setup.py
===================================================================
--- grok/trunk/setup.py	2008-02-08 20:04:49 UTC (rev 83675)
+++ grok/trunk/setup.py	2008-02-09 10:13:22 UTC (rev 83676)
@@ -55,7 +55,6 @@
                       'zope.app.publisher',
                       'zope.app.renderer',
                       'zope.app.security',
-                      'zope.app.securitypolicy',
                       'zope.app.testing',
                       'zope.app.twisted',
                       'zope.app.zcmlfiles',
@@ -74,6 +73,7 @@
                       'zope.publisher',
                       'zope.schema',
                       'zope.security',
+                      'zope.securitypolicy',
                       'zope.testing',
                       'zope.traversing',
                       'zope.testbrowser',

Modified: grok/trunk/src/grok/configure.zcml
===================================================================
--- grok/trunk/src/grok/configure.zcml	2008-02-08 20:04:49 UTC (rev 83675)
+++ grok/trunk/src/grok/configure.zcml	2008-02-09 10:13:22 UTC (rev 83676)
@@ -5,7 +5,7 @@
 
   <include package="zope.security" file="meta.zcml" />
   <include package="zope.i18n" file="meta.zcml" />
-  <include package="zope.app.securitypolicy" file="meta.zcml" />
+  <include package="zope.securitypolicy" file="meta.zcml" />
   <include package="zope.app.zcmlfiles" file="meta.zcml" />
   <include package="grok" file="meta.zcml" />
 
@@ -14,11 +14,11 @@
   <include package="zope.formlib" />
   <include package="zope.i18n.locales" />
   <include package="zope.publisher" />
+  <include package="zope.securitypolicy" />
   <include package="zope.size" />
   <include package="zope.traversing" />
   <include package="zope.traversing.browser" />
   <include package="zope.app.zcmlfiles" />
-  <include package="zope.app.securitypolicy" />
   <include package="zope.app.authentication" />
   <include package="zope.app.intid" />
   <include package="zope.app.keyreference" />

Deleted: grok/trunk/src/grok/ftests/security/grant.py
===================================================================
--- grok/trunk/src/grok/ftests/security/grant.py	2008-02-08 20:04:49 UTC (rev 83675)
+++ grok/trunk/src/grok/ftests/security/grant.py	2008-02-09 10:13:22 UTC (rev 83676)
@@ -1,27 +0,0 @@
-# -*- coding: latin-1 -*-
-"""
-We can define a few permissions with grok.Permission and then take a
-look at them in Zope 3's grant view:
-
-  >>> from zope.testbrowser.testing import Browser
-  >>> browser = Browser()
-  >>> browser.handleErrors = False
-
-  >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')
-  >>> browser.open("http://localhost/@@grant.html")
-
-  >>> browser.getControl(name='field.principal.MA__.searchstring').value = 'manager'
-  >>> browser.getControl('Search').click()
-  >>> browser.getControl('Apply').click()
-  >>> 'grok.ascii-permission' in browser.contents
-  True
-
-"""
-import grok
-
-class ASCIIPermission(grok.Permission):
-    grok.name('grok.ascii-permission')
-
-# TODO Technically, it's absolutely possible to give permissions
-# non-ASCII names. However the way Zope 3's grant view uses widgets to
-# display form controls for each permission is not unicode-safe.

Modified: grok/trunk/versions.cfg
===================================================================
--- grok/trunk/versions.cfg	2008-02-08 20:04:49 UTC (rev 83675)
+++ grok/trunk/versions.cfg	2008-02-09 10:13:22 UTC (rev 83676)
@@ -48,7 +48,6 @@
 zope.app.rotterdam = 3.4.0a1
 zope.app.schema = 3.4.0a1
 zope.app.security = 3.4.0a1-1
-zope.app.securitypolicy = 3.4.6
 zope.app.server = 3.4.0a1-4
 zope.app.session = 3.4.0a1
 zope.app.skins = 3.4.0a1
@@ -88,6 +87,7 @@
 zope.publisher = 3.5.0a1.dev-r78838
 zope.schema = 3.4.0
 zope.security = 3.4.0b5
+zope.securitypolicy = 3.4.0
 zope.server = 3.5.0a2
 zope.session = 3.4.1
 zope.size = 3.4.0