SVN: CMF/trunk/ - fixed Zope version test (FiveTraversable was readded in Zope 2.10)
Yvo Schubbe <[email protected]>
| Newsgroups | gmane.comp.web.zope.cmf.cvs |
|---|---|
| Message-ID | <[email protected]> |
Log message for revision 69231:
- fixed Zope version test (FiveTraversable was readded in Zope 2.10)
- reverted now obsolete change in DCWorkflow's test_exportimport.py
Changed:
U CMF/trunk/CMFCore/tests/base/testcase.py
U CMF/trunk/DCWorkflow/tests/test_exportimport.py
-=-
Modified: CMF/trunk/CMFCore/tests/base/testcase.py
===================================================================
--- CMF/trunk/CMFCore/tests/base/testcase.py 2006-07-21 10:44:38 UTC (rev 69230)
+++ CMF/trunk/CMFCore/tests/base/testcase.py 2006-07-21 11:42:15 UTC (rev 69231)
@@ -49,11 +49,11 @@
zcml.load_config('meta.zcml', Products.Five)
try:
+ import zope.traversing
+ zcml.load_config('traversing.zcml', Products.Five)
+ except ImportError:
# BBB: for Zope 2.9
- from Products.Five.traversable import FiveTraversable
zcml.load_string(_TRAVERSE_ZCML)
- except ImportError:
- zcml.load_config('traversing.zcml', Products.Five)
def setUpEvents():
import Products
Modified: CMF/trunk/DCWorkflow/tests/test_exportimport.py
===================================================================
--- CMF/trunk/DCWorkflow/tests/test_exportimport.py 2006-07-21 10:44:38 UTC (rev 69230)
+++ CMF/trunk/DCWorkflow/tests/test_exportimport.py 2006-07-21 11:42:15 UTC (rev 69231)
@@ -81,14 +81,6 @@
setUpGenericSetup()
zcml.load_config('permissions.zcml', Products.Five)
zcml.load_config('configure.zcml', Products.DCWorkflow)
- try:
- import zope.traversing
- except ImportError:
- # BBB: Zope < 2.10
- pass
- else:
- # Traversal adapters are needed for TALES
- zcml.load_config('configure.zcml', zope.traversing)
def _initDCWorkflow( self, workflow_id ):