[CMF-checkins] CVS: Products/CMFCalendar/tests - test_Calendar.py:1.21 test_Event.py:1.14 test_all.py:1.10

[Tres Seaver]

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

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


=== Products/CMFCalendar/tests/test_Calendar.py 1.20 => 1.21 ===
--- Products/CMFCalendar/tests/test_Calendar.py:1.20	Tue Apr  5 05:26:53 2005
+++ Products/CMFCalendar/tests/test_Calendar.py	Wed Jun 15 10:17:37 2005
@@ -17,11 +17,7 @@
 
 import unittest
 import Testing
-try:
-    import Zope2
-except ImportError:
-    # BBB: for Zope 2.7
-    import Zope as Zope2
+import Zope2
 Zope2.startup()
 
 import locale
@@ -33,11 +29,7 @@
 from Products.TemporaryFolder.TemporaryFolder import MountedTemporaryFolder
 from Products.Transience.Transience import TransientObjectContainer
 from Testing.makerequest import makerequest
-try:
-    import transaction
-except ImportError:
-    # BBB: for Zope 2.7
-    from Products.CMFCore.utils import transaction
+import transaction
 
 
 class CalendarTests(unittest.TestCase):


=== Products/CMFCalendar/tests/test_Event.py 1.13 => 1.14 ===
--- Products/CMFCalendar/tests/test_Event.py:1.13	Mon Jun 13 13:32:04 2005
+++ Products/CMFCalendar/tests/test_Event.py	Wed Jun 15 10:17:37 2005
@@ -17,8 +17,8 @@
 
 from unittest import TestCase, TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
 
 from DateTime import DateTime
 
@@ -54,11 +54,7 @@
         verifyClass(IMutableDublinCore, Event)
 
     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.CMFCalendar.Event import Event
         from Products.CMFCore.interfaces import ICatalogableDublinCore
         from Products.CMFCore.interfaces import IContentish


=== Products/CMFCalendar/tests/test_all.py 1.9 => 1.10 ===
--- Products/CMFCalendar/tests/test_all.py:1.9	Thu Aug 12 11:07:38 2004
+++ Products/CMFCalendar/tests/test_all.py	Wed Jun 15 10:17:37 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