[CMF-checkins] CVS: CMF/CMFActionIcons/tests - test_ActionIconsTool.py:1.4.2.1 test_all.py:1.2.2.1

[Tres Seaver]

Update of /cvs-repository/CMF/CMFActionIcons/tests
In directory cvs.zope.org:/tmp/cvs-serv17354/CMFActionIcons/tests

Modified Files:
      Tag: CMF-1_5-branch
	test_ActionIconsTool.py test_all.py 
Log Message:


 - Moved tests which used to 'import Zope' to try 'import Zope2'
   (with a fallback for Zope 2.7).  Thanks to sacco for the patch!
   (http://www.zope.org/Collectors/CMF/362)



=== CMF/CMFActionIcons/tests/test_ActionIconsTool.py 1.4 => 1.4.2.1 ===
--- CMF/CMFActionIcons/tests/test_ActionIconsTool.py:1.4	Thu Aug 12 11:07:37 2004
+++ CMF/CMFActionIcons/tests/test_ActionIconsTool.py	Fri Jul  8 08:28:29 2005
@@ -17,8 +17,11 @@
 
 import unittest
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except: 	# BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 
 
 class ActionIconToolTests( unittest.TestCase ):


=== CMF/CMFActionIcons/tests/test_all.py 1.2 => 1.2.2.1 ===
--- CMF/CMFActionIcons/tests/test_all.py:1.2	Thu Aug 12 11:07:37 2004
+++ CMF/CMFActionIcons/tests/test_all.py	Fri Jul  8 08:28:29 2005
@@ -17,8 +17,11 @@
 
 from unittest import main
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except: 	# BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 
 from Products.CMFCore.tests.base.utils import build_test_suite