[Checkins] SVN: zope.securitypolicy/trunk/ Use "zope.authentication" instead of "zope.app.security" thus dropping a bunch of unused dependencies.

[Dan Korostelev]

Log message for revision 97975:
  Use "zope.authentication" instead of "zope.app.security" thus dropping a bunch of unused dependencies.

Changed:
  U   zope.securitypolicy/trunk/CHANGES.txt
  U   zope.securitypolicy/trunk/buildout.cfg
  U   zope.securitypolicy/trunk/setup.py
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/principalpermission.py
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/principalrole.py
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.py
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalrolemanager.py
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalpermissionmanager.py
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalrolemanager.py
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_securitydirectives.py
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_settings.py
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.py
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.txt

-=-
Modified: zope.securitypolicy/trunk/CHANGES.txt
===================================================================
--- zope.securitypolicy/trunk/CHANGES.txt	2009-03-12 09:31:25 UTC (rev 97974)
+++ zope.securitypolicy/trunk/CHANGES.txt	2009-03-12 09:48:57 UTC (rev 97975)
@@ -2,10 +2,11 @@
 CHANGES
 =======
 
-3.5.2 (unreleased)
+3.6.0 (unreleased)
 ------------------
 
-- ...
+- Change ``zope.app.security`` dependency to the new ``zope.authentication``
+  package, dropping a big number of unused dependencies. 
 
 3.5.1 (2009-03-10)
 ------------------

Modified: zope.securitypolicy/trunk/buildout.cfg
===================================================================
--- zope.securitypolicy/trunk/buildout.cfg	2009-03-12 09:31:25 UTC (rev 97974)
+++ zope.securitypolicy/trunk/buildout.cfg	2009-03-12 09:48:57 UTC (rev 97975)
@@ -1,7 +1,20 @@
 [buildout]
-develop = . 
-parts = test
+develop =
+  .
+  ../zope.authentication
+  ../zope.component
+  ../zope.principalregistry 
 
+  ../zope.container
+  ../zope.app.publisher
+  ../zope.app.testing
+parts = test python
+
 [test]
 recipe = zc.recipe.testrunner
 eggs = zope.securitypolicy [test]
+
+[python]
+recipe = zc.recipe.egg
+eggs = zope.securitypolicy
+interpreter = python

Modified: zope.securitypolicy/trunk/setup.py
===================================================================
--- zope.securitypolicy/trunk/setup.py	2009-03-12 09:31:25 UTC (rev 97974)
+++ zope.securitypolicy/trunk/setup.py	2009-03-12 09:48:57 UTC (rev 97975)
@@ -24,7 +24,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='zope.securitypolicy',
-    version = '3.5.2dev',
+    version = '3.6.0dev',
     author='Zope Corporation and Contributors',
     author_email='zope-dev at zope.org',
     description='Default security policy for Zope3',
@@ -52,11 +52,12 @@
     package_dir={'': 'src'},
     namespace_packages=['zope'],
     extras_require=dict(
-        test=['zope.app.testing']),
+        test=['zope.app.testing',
+              'zope.principalregistry']),
     install_requires=[
         'setuptools',
         'zope.annotation',
-        'zope.app.security',
+        'zope.authentication',
         'zope.component',
         'zope.configuration',
         'zope.i18nmessageid',

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/principalpermission.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/principalpermission.py	2009-03-12 09:31:25 UTC (rev 97974)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/principalpermission.py	2009-03-12 09:48:57 UTC (rev 97975)
@@ -19,14 +19,13 @@
 from zope.interface import implements
 from zope.security.permission import allPermissions
 
+from zope.authentication.principal import checkPrincipal
 from zope.securitypolicy.interfaces import Allow, Deny, Unset
 from zope.securitypolicy.interfaces import IPrincipalPermissionManager
 from zope.securitypolicy.securitymap import SecurityMap
 from zope.securitypolicy.securitymap import AnnotationSecurityMap
 
-from zope.app.security.principal import checkPrincipal
 
-
 class AnnotationPrincipalPermissionManager(AnnotationSecurityMap):
     """Mappings between principals and permissions."""
 

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/principalrole.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/principalrole.py	2009-03-12 09:31:25 UTC (rev 97974)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/principalrole.py	2009-03-12 09:48:57 UTC (rev 97975)
@@ -17,12 +17,12 @@
 """
 from zope.interface import implements
 
+from zope.authentication.principal import checkPrincipal
 from zope.securitypolicy.interfaces import Allow, Deny, Unset
 from zope.securitypolicy.interfaces import IPrincipalRoleManager
 from zope.securitypolicy.securitymap import SecurityMap
 from zope.securitypolicy.securitymap import AnnotationSecurityMap
 from zope.securitypolicy.role import checkRole
-from zope.app.security.principal import checkPrincipal
 
 
 class AnnotationPrincipalRoleManager(AnnotationSecurityMap):

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.py	2009-03-12 09:31:25 UTC (rev 97974)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalpermissionmanager.py	2009-03-12 09:48:57 UTC (rev 97975)
@@ -28,7 +28,7 @@
     AnnotationPrincipalPermissionManager
 
 from zope.app.testing import ztapi
-from zope.app.security.principalregistry import principalRegistry
+from zope.principalregistry.principalregistry import principalRegistry
 from zope.app.testing.placelesssetup import PlacelessSetup
 
 class Manageable(object):

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalrolemanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalrolemanager.py	2009-03-12 09:31:25 UTC (rev 97974)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_annotationprincipalrolemanager.py	2009-03-12 09:48:57 UTC (rev 97975)
@@ -20,7 +20,7 @@
 from zope.interface import implements
 from zope.annotation.interfaces import IAttributeAnnotatable
 
-from zope.app.security.principalregistry import principalRegistry
+from zope.principalregistry.principalregistry import principalRegistry
 from zope.app.component.testing import PlacefulSetup
 
 from zope.securitypolicy.principalrole import AnnotationPrincipalRoleManager

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalpermissionmanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalpermissionmanager.py	2009-03-12 09:31:25 UTC (rev 97974)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalpermissionmanager.py	2009-03-12 09:48:57 UTC (rev 97975)
@@ -22,8 +22,8 @@
 
 from zope.app.testing import ztapi
 from zope.app.testing.placelesssetup import PlacelessSetup
-from zope.app.security.interfaces import IAuthentication
-from zope.app.security.principalregistry import principalRegistry
+from zope.authentication.interfaces import IAuthentication
+from zope.principalregistry.principalregistry import principalRegistry
 
 from zope.securitypolicy.interfaces import Allow, Deny, Unset
 from zope.securitypolicy.principalpermission import \

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalrolemanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalrolemanager.py	2009-03-12 09:31:25 UTC (rev 97974)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_principalrolemanager.py	2009-03-12 09:48:57 UTC (rev 97975)
@@ -20,8 +20,8 @@
 from zope.app.testing import ztapi
 from zope.app.testing.placelesssetup import PlacelessSetup
 
-from zope.app.security.interfaces import IAuthentication
-from zope.app.security.principalregistry import principalRegistry
+from zope.authentication.interfaces import IAuthentication
+from zope.principalregistry.principalregistry import principalRegistry
 
 from zope.securitypolicy.role import Role
 from zope.securitypolicy.interfaces import Allow, Deny

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_securitydirectives.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_securitydirectives.py	2009-03-12 09:31:25 UTC (rev 97974)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_securitydirectives.py	2009-03-12 09:48:57 UTC (rev 97975)
@@ -25,8 +25,8 @@
 
 from zope.app.testing import ztapi
 from zope.app.testing.placelesssetup import PlacelessSetup
-from zope.app.security.interfaces import IAuthentication
-from zope.app.security.principalregistry import principalRegistry
+from zope.authentication.interfaces import IAuthentication
+from zope.principalregistry.principalregistry import principalRegistry
 
 from zope.securitypolicy.role import Role
 from zope.securitypolicy.interfaces import Allow

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_settings.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_settings.py	2009-03-12 09:31:25 UTC (rev 97974)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/tests/test_settings.py	2009-03-12 09:48:57 UTC (rev 97975)
@@ -16,11 +16,11 @@
 $Id$
 """
 import unittest
-
-from zope.app.security.settings import Allow
 from cPickle import Pickler, Unpickler
 from StringIO import StringIO
 
+from zope.securitypolicy.interfaces import Allow
+
 class Test(unittest.TestCase):
 
     def testPickleUnpickle(self):

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.py	2009-03-12 09:31:25 UTC (rev 97974)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.py	2009-03-12 09:48:57 UTC (rev 97975)
@@ -25,7 +25,7 @@
 from zope.security.interfaces import ISecurityPolicy
 from zope.security.proxy import removeSecurityProxy
 
-from zope.app.security.interfaces import PrincipalLookupError, IAuthentication
+from zope.authentication.interfaces import PrincipalLookupError, IAuthentication
 
 from zope.securitypolicy.principalpermission import principalPermissionManager
 globalPrincipalPermissionSetting = principalPermissionManager.getSetting

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.txt
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.txt	2009-03-12 09:31:25 UTC (rev 97974)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.txt	2009-03-12 09:48:57 UTC (rev 97975)
@@ -498,7 +498,7 @@
 For our examples here, we'll create and register a stub principal
 authentication service:
 
-  >>> from zope.app.security.interfaces import IAuthentication
+  >>> from zope.authentication.interfaces import IAuthentication
   >>> class FauxPrincipals(object):
   ...     zope.interface.implements(IAuthentication)
   ...     def __init__(self):