[CMF-checkins] CVS: Products/CMFTopic/tests - common.py:1.2 test_DateC.py:1.15 test_ListC.py:1.13 test_SIC.py:1.13 test_SSC.py:1.12 test_SortC.py:1.8 test_Topic.py:1.17 test_all.py:1.9

[Tres Seaver]

Update of /cvs-repository/Products/CMFTopic/tests
In directory cvs.zope.org:/tmp/cvs-serv19326/CMFTopic/tests

Modified Files:
	common.py test_DateC.py test_ListC.py test_SIC.py test_SSC.py 
	test_SortC.py test_Topic.py test_all.py 
Log Message:
 - Merge tseaver-z28_only-branch, removing BBB for Zope 2.7 support.


=== Products/CMFTopic/tests/common.py 1.1 => 1.2 ===
--- Products/CMFTopic/tests/common.py:1.1	Mon Jun 13 13:32:05 2005
+++ Products/CMFTopic/tests/common.py	Wed Jun 15 10:17:40 2005
@@ -30,11 +30,7 @@
         verifyClass( ICriterion, self._getTargetClass() )
 
     def test_z3interfaces(self):
-        try:
-            from zope.interface.verify import verifyClass
-        except ImportError:
-            # BBB: for Zope 2.7
-            return
+        from zope.interface.verify import verifyClass
         from Products.CMFTopic.interfaces import ICriterion
 
         verifyClass( ICriterion, self._getTargetClass() )


=== Products/CMFTopic/tests/test_DateC.py 1.14 => 1.15 ===
--- Products/CMFTopic/tests/test_DateC.py:1.14	Mon Jun 13 13:32:05 2005
+++ Products/CMFTopic/tests/test_DateC.py	Wed Jun 15 10:17:40 2005
@@ -17,8 +17,8 @@
 
 from unittest import TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
 
 from DateTime.DateTime import DateTime
 


=== Products/CMFTopic/tests/test_ListC.py 1.12 => 1.13 ===
--- Products/CMFTopic/tests/test_ListC.py:1.12	Mon Jun 13 13:32:05 2005
+++ Products/CMFTopic/tests/test_ListC.py	Wed Jun 15 10:17:40 2005
@@ -17,8 +17,8 @@
 
 from unittest import TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
 
 from common import CriterionTestCase
 


=== Products/CMFTopic/tests/test_SIC.py 1.12 => 1.13 ===
--- Products/CMFTopic/tests/test_SIC.py:1.12	Mon Jun 13 13:32:05 2005
+++ Products/CMFTopic/tests/test_SIC.py	Wed Jun 15 10:17:40 2005
@@ -17,8 +17,8 @@
 
 from unittest import TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
 
 from common import CriterionTestCase
 


=== Products/CMFTopic/tests/test_SSC.py 1.11 => 1.12 ===
--- Products/CMFTopic/tests/test_SSC.py:1.11	Mon Jun 13 13:32:05 2005
+++ Products/CMFTopic/tests/test_SSC.py	Wed Jun 15 10:17:40 2005
@@ -17,8 +17,8 @@
 
 from unittest import TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
 
 from common import CriterionTestCase
 


=== Products/CMFTopic/tests/test_SortC.py 1.7 => 1.8 ===
--- Products/CMFTopic/tests/test_SortC.py:1.7	Mon Jun 13 13:32:05 2005
+++ Products/CMFTopic/tests/test_SortC.py	Wed Jun 15 10:17:40 2005
@@ -17,8 +17,8 @@
 
 from unittest import TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
 
 from common import CriterionTestCase
 


=== Products/CMFTopic/tests/test_Topic.py 1.16 => 1.17 ===
--- Products/CMFTopic/tests/test_Topic.py:1.16	Mon Jun 13 13:32:05 2005
+++ Products/CMFTopic/tests/test_Topic.py	Wed Jun 15 10:17:40 2005
@@ -17,8 +17,8 @@
 
 from unittest import TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
 
 from Acquisition import Implicit
 
@@ -163,11 +163,7 @@
         verifyClass(WriteLockInterface, Topic)
 
     def test_z3interfaces(self):
-        try:
-            from zope.interface.verify import verifyClass
-        except ImportError:
-            # BBB: for Zope 2.7
-            return
+        from zope.interface.verify import verifyClass
         from Products.CMFCore.interfaces import IDynamicType
         from Products.CMFCore.interfaces import IFolderish
         from Products.CMFTopic.Topic import Topic


=== Products/CMFTopic/tests/test_all.py 1.8 => 1.9 ===
--- Products/CMFTopic/tests/test_all.py:1.8	Thu Aug 12 11:07:43 2004
+++ Products/CMFTopic/tests/test_all.py	Wed Jun 15 10:17:40 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