[Checkins] SVN: zope.securitypolicy/trunk/ Don't depend on the `hook` extra of zope.component, as we don't need it explicitly and it can be removed soon.

[Dan Korostelev]

Log message for revision 97747:
  Don't depend on the `hook` extra of zope.component, as we don't need it explicitly and it can be removed soon.
  
  Import security settings (Allow, Deny, Unset) from the zope.securitypolicy.settings.
  
  Improve documentation formatting, add it to the package's long description.
  
  Remove unused dependencies.
  
  Remove old zpkg-related files and zcml slugs.
  

Changed:
  U   zope.securitypolicy/trunk/CHANGES.txt
  U   zope.securitypolicy/trunk/setup.py
  D   zope.securitypolicy/trunk/src/zope/securitypolicy/DEPENDENCIES.cfg
  D   zope.securitypolicy/trunk/src/zope/securitypolicy/SETUP.cfg
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/interfaces.py
  D   zope.securitypolicy/trunk/src/zope/securitypolicy/securitypolicy-meta.zcml
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/securitypolicy.zcml
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/settings.py
  U   zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.txt

-=-
Modified: zope.securitypolicy/trunk/CHANGES.txt
===================================================================
--- zope.securitypolicy/trunk/CHANGES.txt	2009-03-09 23:32:01 UTC (rev 97746)
+++ zope.securitypolicy/trunk/CHANGES.txt	2009-03-10 00:02:10 UTC (rev 97747)
@@ -5,8 +5,22 @@
 3.5.1 (unreleased)
 ------------------
 
-- ...
+- Don't depend on the `hook` extra of zope.component, as we don't need
+  it explicitly.
 
+- Import security settings (Allow, Deny, Unset) in the ``interfaces``
+  module from the ``zope.securitypolicy.settings``, added in previous
+  release instead of old ``zope.app.security.settings``.
+  The ``zope.app.security`` will be adapted to import them from
+  ``zope.securitypolicy.interfaces``.
+
+- Improve documentation formatting, add it to the package's long
+  description.
+
+- Remove unneeded dependencies.
+
+- Remove old zpkg-related files and zcml slugs.
+
 3.5.0 (2009-01-31)
 ------------------
 

Modified: zope.securitypolicy/trunk/setup.py
===================================================================
--- zope.securitypolicy/trunk/setup.py	2009-03-09 23:32:01 UTC (rev 97746)
+++ zope.securitypolicy/trunk/setup.py	2009-03-10 00:02:10 UTC (rev 97747)
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Setup for zope.app.securitypolicy package
+"""Setup for zope.securitypolicy package
 
 $Id$
 """
@@ -30,6 +30,8 @@
     description='Default security policy for Zope3',
     long_description=(
         read('README.txt')
+        + '\n.. contents::\n\n' +
+        read('src', 'zope', 'securitypolicy', 'zopepolicy.txt')
         + '\n\n' +
         read('CHANGES.txt')
         ),
@@ -55,10 +57,8 @@
         'setuptools',
         'zope.annotation',
         'zope.app.security',
-        'zope.component [hook]',
+        'zope.component',
         'zope.configuration',
-        'zope.exceptions',
-        'zope.i18n',
         'zope.i18nmessageid',
         'zope.interface',
         'zope.location',

Deleted: zope.securitypolicy/trunk/src/zope/securitypolicy/DEPENDENCIES.cfg
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/DEPENDENCIES.cfg	2009-03-09 23:32:01 UTC (rev 97746)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/DEPENDENCIES.cfg	2009-03-10 00:02:10 UTC (rev 97747)
@@ -1,9 +0,0 @@
-persistent
-zope.app
-zope.configuration
-zope.interface
-zope.proxy
-zope.publisher
-zope.schema
-zope.security
-zope.testing

Deleted: zope.securitypolicy/trunk/src/zope/securitypolicy/SETUP.cfg
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/SETUP.cfg	2009-03-09 23:32:01 UTC (rev 97746)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/SETUP.cfg	2009-03-10 00:02:10 UTC (rev 97747)
@@ -1,9 +0,0 @@
-# Tell zpkg how to install the ZCML slugs.
-
-<data-files zopeskel/etc/package-includes>
-  securitypolicy-meta.zcml
-</data-files>
-
-<data-files zopeskel/etc>
-  securitypolicy.zcml
-</data-files>

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/interfaces.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/interfaces.py	2009-03-09 23:32:01 UTC (rev 97746)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/interfaces.py	2009-03-10 00:02:10 UTC (rev 97747)
@@ -21,13 +21,11 @@
 from zope.interface import Interface
 from zope.schema import TextLine, Text
 
-
 # These are the "setting" values returned by several methods defined
 # in these interfaces.  The implementation may move to another
 # location in the future, so this should be the preferred module to
 # import these from.
-#
-from zope.app.security.settings import Allow, Deny, Unset
+from zope.securitypolicy.settings import Allow, Deny, Unset
 
 
 class IRole(Interface):

Deleted: zope.securitypolicy/trunk/src/zope/securitypolicy/securitypolicy-meta.zcml
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/securitypolicy-meta.zcml	2009-03-09 23:32:01 UTC (rev 97746)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/securitypolicy-meta.zcml	2009-03-10 00:02:10 UTC (rev 97747)
@@ -1 +0,0 @@
-<include package="zope.securitypolicy" file="meta.zcml" />

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/securitypolicy.zcml
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/securitypolicy.zcml	2009-03-09 23:32:01 UTC (rev 97746)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/securitypolicy.zcml	2009-03-10 00:02:10 UTC (rev 97747)
@@ -3,6 +3,8 @@
     i18n_domain="zope"
     >
 
+  <!-- This file contains sample security policy definition -->
+
   <include package="zope.securitypolicy" />
 
   <securityPolicy

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/settings.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/settings.py	2009-03-09 23:32:01 UTC (rev 97746)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/settings.py	2009-03-10 00:02:10 UTC (rev 97747)
@@ -14,7 +14,7 @@
 """Security setting constants.
 
 The `Allow`, `Deny`, and `Unset` constants are exposed by the
-`zope.app.securitypolicy.interfaces` module, and should be imported
+`zope.securitypolicy.interfaces` module, and should be imported
 from there.
 
 $Id$

Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.txt
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.txt	2009-03-09 23:32:01 UTC (rev 97746)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.txt	2009-03-10 00:02:10 UTC (rev 97747)
@@ -1,3 +1,4 @@
+============================
 Classic Zope Security Policy
 ============================
 
@@ -649,8 +650,6 @@
   >>> interaction.checkPermission('gP4', ob2)
   True
 
-Cleanup
--------
 
 We clean up the changes we made in these examples: