[CMF-checkins] CVS: Products/CMFCore/tests/base - testcase.py:1.15

[Tres Seaver]

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

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


=== Products/CMFCore/tests/base/testcase.py 1.14 => 1.15 ===
--- Products/CMFCore/tests/base/testcase.py:1.14	Wed Apr  6 05:54:45 2005
+++ Products/CMFCore/tests/base/testcase.py	Wed Jun 15 10:17:38 2005
@@ -1,9 +1,5 @@
 from unittest import TestCase
-try:
-    import Zope2
-except ImportError:
-    # BBB: for Zope 2.7
-    import Zope as Zope2
+import Zope2
 Zope2.startup()
 
 from os import curdir, mkdir, stat, remove
@@ -17,11 +13,7 @@
 from AccessControl.SecurityManagement import noSecurityManager
 from AccessControl.SecurityManager import setSecurityPolicy
 from Testing.makerequest import makerequest
-try:
-    import transaction
-except ImportError:
-    # BBB: for Zope 2.7
-    from Products.CMFCore.utils import transaction
+import transaction
 
 from dummy import DummyFolder
 from security import AnonymousUser