[CMF-checkins] SVN: CMF/branches/2.0/ - fixed Zope version test (FiveTraversable was readded in Zope 2.10)

[Yvo Schubbe]

Log message for revision 69232:
  - fixed Zope version test (FiveTraversable was readded in Zope 2.10)
  - reverted now obsolete change in DCWorkflow's test_exportimport.py

Changed:
  _U  CMF/branches/2.0/
  U   CMF/branches/2.0/CMFCore/tests/base/testcase.py
  U   CMF/branches/2.0/DCWorkflow/tests/test_exportimport.py
  U   CMF/branches/2.0/EXTERNALS.txt

-=-

Property changes on: CMF/branches/2.0
___________________________________________________________________
Name: svn:externals
   - #
# Used for maintenance of external resources in this svn bundle.  Edit
# this file as appropriate and then run the following command from within
# the checkout directory where this file lives on your local machine:
#
# svn propset svn:externals -F ./EXTERNALS.TXT .
#
GenericSetup -r 68596 svn://svn.zope.org/repos/main/GenericSetup/trunk

   + #
# Used for maintenance of external resources in this svn bundle.  Edit
# this file as appropriate and then run the following command from within
# the checkout directory where this file lives on your local machine:
#
# svn propset svn:externals -F ./EXTERNALS.TXT .
#
GenericSetup -r 69230 svn://svn.zope.org/repos/main/GenericSetup/trunk


Modified: CMF/branches/2.0/CMFCore/tests/base/testcase.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/base/testcase.py	2006-07-21 11:42:15 UTC (rev 69231)
+++ CMF/branches/2.0/CMFCore/tests/base/testcase.py	2006-07-21 11:44:41 UTC (rev 69232)
@@ -46,13 +46,14 @@
 
 def setUpTraversing():
     import Products.Five
+
     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)
 
 
 class LogInterceptor:

Modified: CMF/branches/2.0/DCWorkflow/tests/test_exportimport.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/tests/test_exportimport.py	2006-07-21 11:42:15 UTC (rev 69231)
+++ CMF/branches/2.0/DCWorkflow/tests/test_exportimport.py	2006-07-21 11:44:41 UTC (rev 69232)
@@ -81,14 +81,6 @@
         zcml.load_config('permissions.zcml', Products.Five)
         zcml.load_config('configure.zcml', Products.DCWorkflow)
         zcml.load_config('configure.zcml', Products.GenericSetup.PythonScripts)
-        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 ):
 

Modified: CMF/branches/2.0/EXTERNALS.txt
===================================================================
--- CMF/branches/2.0/EXTERNALS.txt	2006-07-21 11:42:15 UTC (rev 69231)
+++ CMF/branches/2.0/EXTERNALS.txt	2006-07-21 11:44:41 UTC (rev 69232)
@@ -5,4 +5,4 @@
 #
 # svn propset svn:externals -F ./EXTERNALS.TXT .
 #
-GenericSetup -r 68596 svn://svn.zope.org/repos/main/GenericSetup/trunk
+GenericSetup -r 69230 svn://svn.zope.org/repos/main/GenericSetup/trunk