[CMF-checkins] CVS: CMF/CMFActionIcons/tests - test_ActionIconsTool.py:1.5 test_all.py:1.3

[Tres Seaver]

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

Modified Files:
	test_ActionIconsTool.py test_all.py 
Log Message:
 - Merge tseaver-z28_only-branch, removing BBB for Zope 2.7 support.


=== CMF/CMFActionIcons/tests/test_ActionIconsTool.py 1.4 => 1.5 ===
--- CMF/CMFActionIcons/tests/test_ActionIconsTool.py:1.4	Thu Aug 12 11:07:37 2004
+++ CMF/CMFActionIcons/tests/test_ActionIconsTool.py	Wed Jun 15 10:17:36 2005
@@ -17,8 +17,8 @@
 
 import unittest
 import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
 
 
 class ActionIconToolTests( unittest.TestCase ):


=== CMF/CMFActionIcons/tests/test_all.py 1.2 => 1.3 ===
--- CMF/CMFActionIcons/tests/test_all.py:1.2	Thu Aug 12 11:07:37 2004
+++ CMF/CMFActionIcons/tests/test_all.py	Wed Jun 15 10:17:36 2005
@@ -17,8 +17,8 @@
 
 from unittest import main
 import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
 
 from Products.CMFCore.tests.base.utils import build_test_suite