[Checkins] SVN: zope.app.security/trunk/ The zope.localpermission has been renamed to zope.app.localpermission and its browser zcml directives was moved into it. Adapt this package.
Dan Korostelev
nadako at gmail.com
Fri Mar 13 19:49:38 EDT 2009
Log message for revision 98062:
The zope.localpermission has been renamed to zope.app.localpermission and its browser zcml directives was moved into it. Adapt this package.
Changed:
U zope.app.security/trunk/CHANGES.txt
U zope.app.security/trunk/README.txt
U zope.app.security/trunk/buildout.cfg
U zope.app.security/trunk/setup.py
U zope.app.security/trunk/src/zope/app/security/browser/configure.zcml
D zope.app.security/trunk/src/zope/app/security/browser/localpermission.zcml
U zope.app.security/trunk/src/zope/app/security/configure.zcml
U zope.app.security/trunk/src/zope/app/security/permission.py
U zope.app.security/trunk/src/zope/app/security/tests/test_permission.py
-=-
Modified: zope.app.security/trunk/CHANGES.txt
===================================================================
--- zope.app.security/trunk/CHANGES.txt 2009-03-13 23:47:39 UTC (rev 98061)
+++ zope.app.security/trunk/CHANGES.txt 2009-03-13 23:49:38 UTC (rev 98062)
@@ -33,15 +33,10 @@
- The addCheckerPublic was moved from zope.app.security.tests to
zope.security.testing. Backward-compatibility import is provided.
-- The ``LocalPermission`` class is now moved to new ``zope.localpermission``
- package. This package now only has backward-compatibility imports and browser
- views and menu items for ZMI.
+- The ``LocalPermission`` class is now moved to new ``zope.app.localpermission``
+ package. This package now only has backward-compatibility imports and
+ zcml includes.
-- The browser views and menu item for ``LocalPermission`` was moved into a
- separate `browser/localpermission.zcml` file that is included by
- `browser/configure.zcml`. This adds a possibility to exclude ZMI-related
- configuration for local permissions.
-
- Cleanup dependencies after refactorings. Also, don't depend on
zope.app.testing for tests anymore.
Modified: zope.app.security/trunk/README.txt
===================================================================
--- zope.app.security/trunk/README.txt 2009-03-13 23:47:39 UTC (rev 98061)
+++ zope.app.security/trunk/README.txt 2009-03-13 23:49:38 UTC (rev 98062)
@@ -8,8 +8,8 @@
* zope.authentication - the IAuthentication interface and related utilities.
* zope.principalregistry - the global principal registry and its zcml directives.
- * zope.localpermission - the LocalPermission class that implements persistent
- permissions.
+ * zope.app.localpermission - the LocalPermission class that implements
+ persistent permissions.
The rest of functionality that were provided by this package is merged into
``zope.security`` and ``zope.publisher``.
Modified: zope.app.security/trunk/buildout.cfg
===================================================================
--- zope.app.security/trunk/buildout.cfg 2009-03-13 23:47:39 UTC (rev 98061)
+++ zope.app.security/trunk/buildout.cfg 2009-03-13 23:49:38 UTC (rev 98062)
@@ -3,10 +3,10 @@
develop =
.
../zope.authentication
- ../zope.localpermission
../zope.principalregistry
../zope.publisher
../zope.security
+ ../zope.app.localpermission
[test]
recipe = zc.recipe.testrunner
Modified: zope.app.security/trunk/setup.py
===================================================================
--- zope.app.security/trunk/setup.py 2009-03-13 23:47:39 UTC (rev 98061)
+++ zope.app.security/trunk/setup.py 2009-03-13 23:49:38 UTC (rev 98062)
@@ -59,12 +59,12 @@
'zope.app.form',
'zope.app.pagetemplate',
'zope.app.publisher',
+ 'zope.app.localpermission',
'zope.authentication',
'zope.component>=3.6.0',
'zope.i18n',
'zope.i18nmessageid',
'zope.interface',
- 'zope.localpermission',
'zope.principalregistry',
'zope.publisher',
'zope.security',
Modified: zope.app.security/trunk/src/zope/app/security/browser/configure.zcml
===================================================================
--- zope.app.security/trunk/src/zope/app/security/browser/configure.zcml 2009-03-13 23:47:39 UTC (rev 98061)
+++ zope.app.security/trunk/src/zope/app/security/browser/configure.zcml 2009-03-13 23:49:38 UTC (rev 98062)
@@ -44,6 +44,6 @@
permission="zope.Public"
/>
- <include file="localpermission.zcml" />
+ <include package="zope.app.localpermission" file="browser.zcml" />
</configure>
Deleted: zope.app.security/trunk/src/zope/app/security/browser/localpermission.zcml
===================================================================
--- zope.app.security/trunk/src/zope/app/security/browser/localpermission.zcml 2009-03-13 23:47:39 UTC (rev 98061)
+++ zope.app.security/trunk/src/zope/app/security/browser/localpermission.zcml 2009-03-13 23:49:38 UTC (rev 98062)
@@ -1,29 +0,0 @@
-<configure
- xmlns="http://namespaces.zope.org/zope"
- xmlns:browser="http://namespaces.zope.org/browser">
-
- <browser:addform
- name="AddPermission.html"
- schema="zope.security.interfaces.IPermission"
- label="Add Permission"
- content_factory="..permission.LocalPermission"
- fields="title description"
- permission="zope.Security"
- />
-
- <browser:addMenuItem
- title="Permission"
- description="A Security Permission"
- class="..permission.LocalPermission"
- permission="zope.ManageServices"
- view="AddPermission.html"
- />
-
- <browser:editform
- schema="zope.security.interfaces.IPermission"
- label="Edit Permission"
- name="edit.html"
- permission="zope.ManageServices"
- menu="zmi_views" title="Edit" />
-
-</configure>
Modified: zope.app.security/trunk/src/zope/app/security/configure.zcml
===================================================================
--- zope.app.security/trunk/src/zope/app/security/configure.zcml 2009-03-13 23:47:39 UTC (rev 98061)
+++ zope.app.security/trunk/src/zope/app/security/configure.zcml 2009-03-13 23:49:38 UTC (rev 98062)
@@ -6,7 +6,7 @@
<include package="zope.security" />
<include package="zope.authentication" />
<include package="zope.principalregistry" />
- <include package="zope.localpermission" />
+ <include package="zope.app.localpermission" />
<include file="globalmodules.zcml" />
<include file="_protections.zcml" />
Modified: zope.app.security/trunk/src/zope/app/security/permission.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/permission.py 2009-03-13 23:47:39 UTC (rev 98061)
+++ zope.app.security/trunk/src/zope/app/security/permission.py 2009-03-13 23:49:38 UTC (rev 98062)
@@ -11,14 +11,14 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Backward compatibility imports for zope.localpermission.
+"""Backward compatibility imports for zope.app.localpermission.
$Id$
"""
__docformat__ = 'restructuredtext'
-# BBB: the functionality was moved to zope.localpermission
-from zope.localpermission.permission import (
+# BBB: the functionality was moved to zope.app.localpermission
+from zope.app.localpermission.permission import (
NULL_ID,
LocalPermission,
setIdOnActivation,
Modified: zope.app.security/trunk/src/zope/app/security/tests/test_permission.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/tests/test_permission.py 2009-03-13 23:47:39 UTC (rev 98061)
+++ zope.app.security/trunk/src/zope/app/security/tests/test_permission.py 2009-03-13 23:49:38 UTC (rev 98062)
@@ -23,7 +23,7 @@
Let's test that backward-compatibility imports still work:
>>> from zope.app.security import permission as old
- >>> from zope.localpermission import permission as new
+ >>> from zope.app.localpermission import permission as new
>>> old.NULL_ID is new.NULL_ID
True
More information about the Checkins
mailing list