summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt4
-rw-r--r--setup.py4
-rw-r--r--src/zope/traversing/tests/ftesting.zcml11
3 files changed, 5 insertions, 14 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 2a45a38..a8e572d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,9 +2,11 @@
Changes
=======
-3.11.1 (unreleased)
+3.12.0 (unreleased)
-------------------
+- Avoid testing dependencies on zope.securitypolicies and
+ zope.principalregistry.
3.11.0 (2009-12-27)
-------------------
diff --git a/setup.py b/setup.py
index 7479fb3..b8e90e0 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ long_description = (open('README.txt').read() +
open('CHANGES.txt').read())
setup(name='zope.traversing',
- version = '3.11.1dev',
+ version = '3.12.0dev',
url='http://pypi.python.org/pypi/zope.traversing',
license='ZPL 2.1',
author='Zope Corporation and Contributors',
@@ -43,8 +43,6 @@ setup(name='zope.traversing',
'zope.configuration',
'zope.container',
'zope.pagetemplate',
- 'zope.principalregistry',
- 'zope.securitypolicy',
'zope.site',
'zope.tal >= 3.5.0',
'zope.testing',
diff --git a/src/zope/traversing/tests/ftesting.zcml b/src/zope/traversing/tests/ftesting.zcml
index 752e60d..bc4e131 100644
--- a/src/zope/traversing/tests/ftesting.zcml
+++ b/src/zope/traversing/tests/ftesting.zcml
@@ -9,12 +9,10 @@
<include package="zope.component" file="meta.zcml" />
<include package="zope.publisher" file="meta.zcml" />
<include package="zope.security" file="meta.zcml" />
- <include package="zope.securitypolicy" file="meta.zcml" />
<include package="zope.browserresource" />
<include package="zope.container" />
<include package="zope.location" />
- <include package="zope.principalregistry" />
<include package="zope.publisher" />
<include package="zope.security" />
<include package="zope.site" />
@@ -51,14 +49,7 @@
<!-- Principals -->
<securityPolicy
- component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
-
- <role id="zope.Anonymous" title="Everybody"
- description="All users have this role implicitly" />
-
- <!-- Replace the following directive if you don't want public access -->
- <grant permission="zope.View"
- role="zope.Anonymous" />
+ component="zope.security.simplepolicies.PermissiveSecurityPolicy" />
</configure>