[Checkins] SVN: grok/trunk/src/grok/ reverted zope.securitypolicy imports to zope.app.securitypolicy to solve a dependency problem on Windows where zope.i18nmessageid does not have a suitable version yet

[Luciano Ramalho]

Log message for revision 80559:
  reverted zope.securitypolicy imports to zope.app.securitypolicy to solve a dependency problem on Windows where zope.i18nmessageid does not have a suitable version yet
  

Changed:
  U   grok/trunk/src/grok/components.py
  U   grok/trunk/src/grok/ftests/security/require.py
  U   grok/trunk/src/grok/ftests/security/roles.py
  U   grok/trunk/src/grok/meta.py

-=-
Modified: grok/trunk/src/grok/components.py
===================================================================
--- grok/trunk/src/grok/components.py	2007-10-03 18:24:08 UTC (rev 80558)
+++ grok/trunk/src/grok/components.py	2007-10-03 18:55:52 UTC (rev 80559)
@@ -25,7 +25,7 @@
 from zope import interface
 from zope.interface.common import idatetime
 from zope.security.permission import Permission
-from zope.securitypolicy.role import Role
+from zope.app.securitypolicy.role import Role
 from zope.publisher.browser import BrowserPage
 from zope.publisher.interfaces import NotFound
 from zope.publisher.interfaces.browser import (IBrowserPublisher,

Modified: grok/trunk/src/grok/ftests/security/require.py
===================================================================
--- grok/trunk/src/grok/ftests/security/require.py	2007-10-03 18:24:08 UTC (rev 80558)
+++ grok/trunk/src/grok/ftests/security/require.py	2007-10-03 18:55:52 UTC (rev 80559)
@@ -10,7 +10,7 @@
 
 When we log in (e.g. as a manager), we can access the view just fine:
 
-  >>> from zope.securitypolicy.rolepermission import rolePermissionManager
+  >>> from zope.app.securitypolicy.rolepermission import rolePermissionManager
   >>> rolePermissionManager.grantPermissionToRole('grok.ViewPainting',
   ...                                             'zope.Manager')
   >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')

Modified: grok/trunk/src/grok/ftests/security/roles.py
===================================================================
--- grok/trunk/src/grok/ftests/security/roles.py	2007-10-03 18:24:08 UTC (rev 80558)
+++ grok/trunk/src/grok/ftests/security/roles.py	2007-10-03 18:55:52 UTC (rev 80559)
@@ -21,7 +21,7 @@
 don't have to modify the global setup).  Then we can access the views
 just fine:
 
-  >>> from zope.securitypolicy.interfaces import IPrincipalRoleManager
+  >>> from zope.app.securitypolicy.interfaces import IPrincipalRoleManager
   >>> root = getRootFolder()
   >>> IPrincipalRoleManager(root).assignRoleToPrincipal(
   ...    'grok.PaintingOwner', 'zope.anybody')

Modified: grok/trunk/src/grok/meta.py
===================================================================
--- grok/trunk/src/grok/meta.py	2007-10-03 18:24:08 UTC (rev 80558)
+++ grok/trunk/src/grok/meta.py	2007-10-03 18:55:52 UTC (rev 80559)
@@ -23,8 +23,8 @@
                                                IBrowserSkinType)
 from zope.publisher.interfaces.xmlrpc import IXMLRPCRequest
 from zope.security.permission import Permission
-from zope.securitypolicy.role import Role
-from zope.securitypolicy.rolepermission import rolePermissionManager
+from zope.app.securitypolicy.role import Role
+from zope.app.securitypolicy.rolepermission import rolePermissionManager
 
 from zope.annotation.interfaces import IAnnotations