[Checkins] SVN: Products.CMFCore/trunk/ - fixed Zope 2.12 compatibility

[Yvo Schubbe]

Log message for revision 107108:
  - fixed Zope 2.12 compatibility

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
  U   Products.CMFCore/trunk/Products/CMFCore/PortalObject.py
  U   Products.CMFCore/trunk/setup.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2009-12-26 17:21:01 UTC (rev 107107)
+++ Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2009-12-26 17:25:18 UTC (rev 107108)
@@ -6,7 +6,7 @@
 
 - Added zope.app.testing as a testing dependency.
 
-- Require new zope.traversing release including the BeforeTraverseEvent.
+- Import BeforeTraverseEvent from new location if available.
 
 - Skinnable and MembershipTool: Removed support for missing REQUEST argument.
   'changeSkin', 'setupCurrentSkin' and 'credentialsChanged' will no longer

Modified: Products.CMFCore/trunk/Products/CMFCore/PortalObject.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/PortalObject.py	2009-12-26 17:21:01 UTC (rev 107107)
+++ Products.CMFCore/trunk/Products/CMFCore/PortalObject.py	2009-12-26 17:25:18 UTC (rev 107108)
@@ -21,7 +21,11 @@
 from zope.component.interfaces import ComponentLookupError
 from zope.event import notify
 from zope.interface import implements
-from zope.traversing.interfaces import BeforeTraverseEvent
+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/trunk/setup.py
===================================================================
--- Products.CMFCore/trunk/setup.py	2009-12-26 17:21:01 UTC (rev 107107)
+++ Products.CMFCore/trunk/setup.py	2009-12-26 17:25:18 UTC (rev 107108)
@@ -12,7 +12,7 @@
     return f.read()
 
 _boundary = '\n' + ('-' * 60) + '\n\n'
-README = (_package_doc('README.txt')
+README = ( _package_doc('README.txt')
          + _boundary
          + _package_doc('CHANGES.txt')
          + _boundary
@@ -49,7 +49,6 @@
           'Zope2 >= 2.12.0b4dev',
           'five.localsitemanager >= 0.3',
           'Products.GenericSetup',
-          'zope.traversing >= 3.9.0',
           ],
       tests_require=[
           'zope.testing >= 3.7.0',
@@ -57,9 +56,8 @@
           ],
       extras_require=dict(
         test=[
-          'zope.testing >= 3.7.0',
           'zope.app.testing',
-        ]),
+          ]),
       test_loader='zope.testing.testrunner.eggsupport:SkipLayers',
       test_suite='Products.%s' % NAME,
       entry_points="""