[CMF-checkins] CVS: CMF/CMFUid/tests - test_all.py:1.4 test_uidannotation.py:1.7 test_uidgeneration.py:1.9 test_uidhandling.py:1.10

[Tres Seaver]

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

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


=== CMF/CMFUid/tests/test_all.py 1.3 => 1.4 ===
--- CMF/CMFUid/tests/test_all.py:1.3	Thu Aug 12 11:07:43 2004
+++ CMF/CMFUid/tests/test_all.py	Wed Jun 15 10:17:40 2005
@@ -10,15 +10,15 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-""" CMFCore tests.
+""" CMFUid tests.
 
 $Id$
 """
 
 from unittest import main
 import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
 
 from Products.CMFCore.tests.base.utils import build_test_suite
 


=== CMF/CMFUid/tests/test_uidannotation.py 1.6 => 1.7 ===
--- CMF/CMFUid/tests/test_uidannotation.py:1.6	Fri Aug 27 04:18:15 2004
+++ CMF/CMFUid/tests/test_uidannotation.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 Interface.Verify import verifyObject
 


=== CMF/CMFUid/tests/test_uidgeneration.py 1.8 => 1.9 ===
--- CMF/CMFUid/tests/test_uidgeneration.py:1.8	Thu Aug 12 11:07:43 2004
+++ CMF/CMFUid/tests/test_uidgeneration.py	Wed Jun 15 10:17:40 2005
@@ -17,8 +17,8 @@
 
 from unittest import TestCase, TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
 
 from Interface.Verify import verifyObject
 


=== CMF/CMFUid/tests/test_uidhandling.py 1.9 => 1.10 ===
--- CMF/CMFUid/tests/test_uidhandling.py:1.9	Sun Mar 13 09:14:09 2005
+++ CMF/CMFUid/tests/test_uidhandling.py	Wed Jun 15 10:17:40 2005
@@ -17,8 +17,8 @@
 
 from unittest import TestCase, TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
 
 from Interface.Verify import verifyObject