[Checkins] SVN: Products.CMFCore/branches/2.2/ Backport test setup fixes for Zope 2.13 compatibility.
Hanno Schlichting
hannosch at hannosch.eu
Sun Jun 6 11:01:27 EDT 2010
Log message for revision 113209:
Backport test setup fixes for Zope 2.13 compatibility.
Changed:
U Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt
U Products.CMFCore/branches/2.2/Products/CMFCore/PortalObject.py
U Products.CMFCore/branches/2.2/Products/CMFCore/configure.zcml
A Products.CMFCore/branches/2.2/Products/CMFCore/permissions.zcml
U Products.CMFCore/branches/2.2/Products/CMFCore/testing.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tool.zcml
U Products.CMFCore/branches/2.2/setup.py
-=-
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt 2010-06-06 14:25:57 UTC (rev 113208)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt 2010-06-06 15:01:26 UTC (rev 113209)
@@ -4,6 +4,8 @@
2.2.2 (unreleased)
------------------
+- Backport test setup fixes for Zope 2.13 compatibility.
+
- Use the standard libraries doctest module.
- Updated setDefaultRoles to use the addPermission API if available.
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/PortalObject.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/PortalObject.py 2010-06-06 14:25:57 UTC (rev 113208)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/PortalObject.py 2010-06-06 15:01:26 UTC (rev 113209)
@@ -18,10 +18,14 @@
from App.class_init import InitializeClass
from five.localsitemanager.registry import PersistentComponents
from Products.Five.component.interfaces import IObjectManagerSite
-from zope.app.publication.zopepublication import BeforeTraverseEvent
from zope.component.interfaces import ComponentLookupError
from zope.event import notify
from zope.interface import implements
+try:
+ from zope.traversing.interfaces import BeforeTraverseEvent
+except ImportError:
+ # BBB: for Zope < 2.13
+ from zope.app.publication.zopepublication import BeforeTraverseEvent
from Products.CMFCore.interfaces import ISiteRoot
from Products.CMFCore.permissions import AddPortalMember
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/configure.zcml
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/configure.zcml 2010-06-06 14:25:57 UTC (rev 113208)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/configure.zcml 2010-06-06 15:01:26 UTC (rev 113209)
@@ -3,6 +3,8 @@
<include package="five.localsitemanager" />
+ <include file="permissions.zcml"/>
+
<include package=".browser"/>
<include package=".exportimport"/>
Copied: Products.CMFCore/branches/2.2/Products/CMFCore/permissions.zcml (from rev 113206, Products.CMFCore/trunk/Products/CMFCore/permissions.zcml)
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/permissions.zcml (rev 0)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/permissions.zcml 2010-06-06 15:01:26 UTC (rev 113209)
@@ -0,0 +1,91 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:zcml="http://namespaces.zope.org/zcml"
+ i18n_domain="cmf_default">
+
+ <!-- CMF Core Permissions -->
+
+ <configure zcml:condition="installed AccessControl.security">
+
+ <permission
+ id="cmf.ListFolderContents"
+ title="List folder contents"
+ />
+
+ <permission
+ id="cmf.ListUndoableChanges"
+ title="List undoable changes"
+ />
+
+ <permission
+ id="cmf.AccessInactivePortalContent"
+ title="Access inactive portal content"
+ />
+
+ <permission
+ id="cmf.ManagePortal"
+ title="Manage portal"
+ />
+
+ <permission
+ id="cmf.ModifyPortalContent"
+ title="Modify portal content"
+ />
+
+ <permission
+ id="cmf.ManageProperties"
+ title="Manage properties"
+ />
+
+ <permission
+ id="cmf.ListPortalMembers"
+ title="List portal members"
+ />
+
+ <permission
+ id="cmf.AddPortalFolders"
+ title="Add portal folders"
+ />
+
+ <permission
+ id="cmf.AddPortalContent"
+ title="Add portal content"
+ />
+
+ <permission
+ id="cmf.AddPortalMember"
+ title="Add portal member"
+ />
+
+ <permission
+ id="cmf.SetOwnPassword"
+ title="Set own password"
+ />
+
+ <permission
+ id="cmf.SetOwnProperties"
+ title="Set own properties"
+ />
+
+ <permission
+ id="cmf.MailForgottonPassword"
+ title="Mail forgotten password"
+ />
+
+ <permission
+ id="cmf.RequestReview"
+ title="Request review"
+ />
+
+ <permission
+ id="cmf.ReviewPortalContent"
+ title="Review portal content"
+ />
+
+ <permission
+ id="cmf.AccessFuturePortalContent"
+ title="Access future portal content"
+ />
+
+ </configure>
+
+</configure>
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/testing.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/testing.py 2010-06-06 14:25:57 UTC (rev 113208)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/testing.py 2010-06-06 15:01:26 UTC (rev 113209)
@@ -100,10 +100,14 @@
@classmethod
def testSetUp(cls):
+ import OFS
import Products
zcml.load_config('meta.zcml', Products.Five)
- zcml.load_config('event.zcml', Products.Five)
+ try:
+ zcml.load_config('event.zcml', OFS)
+ except IOError: # Zope <= 2.12.x
+ zcml.load_config('event.zcml', Products.Five)
zcml.load_config('event.zcml', Products.CMFCore)
setHooks()
@@ -205,16 +209,30 @@
@classmethod
def testSetUp(cls):
+ import Zope2.App
+ import AccessControl
import Products.Five
import Products.GenericSetup
import Products.CMFCore
import Products.CMFCore.exportimport
+ try:
+ zcml.load_config('meta.zcml', Zope2.App)
+ except IOError: # Zope <= 2.12.x
+ pass
+
zcml.load_config('meta.zcml', Products.Five)
- zcml.load_config('meta.zcml', Products.GenericSetup)
+
+ try:
+ zcml.load_config('permissions.zcml', AccessControl)
+ except IOError: # Zope <= 2.12.x
+ pass
+
zcml.load_config('permissions.zcml', Products.Five)
+
zcml.load_config('meta.zcml', Products.GenericSetup)
zcml.load_config('configure.zcml', Products.GenericSetup)
+ zcml.load_config('permissions.zcml', Products.CMFCore)
zcml.load_config('tool.zcml', Products.CMFCore)
zcml.load_config('configure.zcml', Products.CMFCore.exportimport)
zcml.load_string(_DUMMY_ZCML)
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tool.zcml
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tool.zcml 2010-06-06 14:25:57 UTC (rev 113208)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tool.zcml 2010-06-06 15:01:26 UTC (rev 113209)
@@ -2,6 +2,8 @@
xmlns="http://namespaces.zope.org/zope"
xmlns:five="http://namespaces.zope.org/five">
+ <include file="permissions.zcml"/>
+
<five:registerClass
class=".ActionInformation.ActionCategory"
meta_type="CMF Action Category"
Modified: Products.CMFCore/branches/2.2/setup.py
===================================================================
--- Products.CMFCore/branches/2.2/setup.py 2010-06-06 14:25:57 UTC (rev 113208)
+++ Products.CMFCore/branches/2.2/setup.py 2010-06-06 15:01:26 UTC (rev 113209)
@@ -52,7 +52,12 @@
],
tests_require=[
'zope.testing >= 3.7.0',
+ 'zope.app.testing',
],
+ extras_require=dict(
+ test=[
+ 'zope.app.testing',
+ ]),
test_loader='zope.testing.testrunner.eggsupport:SkipLayers',
test_suite='Products.%s' % NAME,
entry_points="""
More information about the checkins
mailing list