Fri Jul 8 08:29:00 EDT 2005

Update of /cvs-repository/Products/CMFDefault/tests
In directory cvs.zope.org:/tmp/cvs-serv17354/CMFDefault/tests

Modified Files:
      Tag: CMF-1_5-branch
	test_DefaultWorkflow.py test_DiscussionReply.py 
	test_DiscussionTool.py test_Discussions.py test_Document.py 
	test_DublinCore.py test_Favorite.py test_Link.py 
	test_MembershipTool.py test_MetadataTool.py test_NewsItem.py 
	test_Portal.py test_PropertiesTool.py test_RegistrationTool.py 
	test_all.py test_join.py test_utils.py 
Log Message:


 - Moved tests which used to 'import Zope' to try 'import Zope2'
   (with a fallback for Zope 2.7).  Thanks to sacco for the patch!
   (http://www.zope.org/Collectors/CMF/362)



=== Products/CMFDefault/tests/test_DefaultWorkflow.py 1.4.8.1 => 1.4.8.2 ===

--- Products/CMFDefault/tests/test_DefaultWorkflow.py:1.4.8.1	Wed Jun 15 06:14:30 2005
+++ Products/CMFDefault/tests/test_DefaultWorkflow.py	Fri Jul  8 08:28:30 2005
@@ -17,8 +17,11 @@
 
 from unittest import TestCase, TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except: 	# BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 
 
 class DefaultWorkflowDefinitionTests(TestCase):


=== Products/CMFDefault/tests/test_DiscussionReply.py 1.1.4.3 => 1.1.4.4 ===
--- Products/CMFDefault/tests/test_DiscussionReply.py:1.1.4.3	Sun Mar 27 13:15:43 2005
+++ Products/CMFDefault/tests/test_DiscussionReply.py	Fri Jul  8 08:28:30 2005
@@ -5,8 +5,11 @@
 from unittest import TestSuite, makeSuite, main
 
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except: 	# BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 
 from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.SecurityManagement import noSecurityManager


=== Products/CMFDefault/tests/test_DiscussionTool.py 1.5.4.1 => 1.5.4.2 ===
--- Products/CMFDefault/tests/test_DiscussionTool.py:1.5.4.1	Wed Jun 15 06:14:30 2005
+++ Products/CMFDefault/tests/test_DiscussionTool.py	Fri Jul  8 08:28:30 2005
@@ -17,8 +17,11 @@
 
 from unittest import TestCase, TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except: 	# BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 
 from Products.CMFCore.tests.base.dummy import DummyFolder
 from Products.CMFCore.tests.base.dummy import DummySite


=== Products/CMFDefault/tests/test_Discussions.py 1.19.6.3 => 1.19.6.4 ===
--- Products/CMFDefault/tests/test_Discussions.py:1.19.6.3	Wed Jun 15 06:14:30 2005
+++ Products/CMFDefault/tests/test_Discussions.py	Fri Jul  8 08:28:30 2005
@@ -17,8 +17,11 @@
 
 from unittest import TestCase, TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except: 	# BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 
 from Products.CMFCore.CatalogTool import CatalogTool
 from Products.CMFCore.tests.base.dummy import DummyContent


=== Products/CMFDefault/tests/test_Document.py 1.37.2.5 => 1.37.2.6 ===
--- Products/CMFDefault/tests/test_Document.py:1.37.2.5	Wed Jun 15 06:14:30 2005
+++ Products/CMFDefault/tests/test_Document.py	Fri Jul  8 08:28:30 2005
@@ -17,8 +17,11 @@
 
 from unittest import TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except: 	# BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 
 from os.path import abspath
 from os.path import dirname


=== Products/CMFDefault/tests/test_DublinCore.py 1.6.2.4 => 1.6.2.5 ===
--- Products/CMFDefault/tests/test_DublinCore.py:1.6.2.4	Wed Jun 15 06:14:30 2005
+++ Products/CMFDefault/tests/test_DublinCore.py	Fri Jul  8 08:28:30 2005
@@ -17,8 +17,11 @@
 
 from unittest import TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except: 	# BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 
 from AccessControl.SecurityManagement import newSecurityManager
 from Acquisition import Implicit


=== Products/CMFDefault/tests/test_Favorite.py 1.10 => 1.10.2.1 ===
--- Products/CMFDefault/tests/test_Favorite.py:1.10	Thu Aug 12 11:07:41 2004
+++ Products/CMFDefault/tests/test_Favorite.py	Fri Jul  8 08:28:30 2005
@@ -17,8 +17,11 @@
 
 from unittest import TestCase, TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except: 	# BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 
 from Products.CMFCore.tests.base.dummy import DummySite
 from Products.CMFCore.tests.base.dummy import DummyTool


=== Products/CMFDefault/tests/test_Link.py 1.12.2.1 => 1.12.2.2 ===
--- Products/CMFDefault/tests/test_Link.py:1.12.2.1	Fri Jul  8 08:11:35 2005
+++ Products/CMFDefault/tests/test_Link.py	Fri Jul  8 08:28:30 2005
@@ -1,7 +1,10 @@
 from unittest import TestCase, TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except: 	# BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 
 from re import compile
 


=== Products/CMFDefault/tests/test_MembershipTool.py 1.12.8.1 => 1.12.8.2 ===
--- Products/CMFDefault/tests/test_MembershipTool.py:1.12.8.1	Wed Jun 15 06:14:30 2005
+++ Products/CMFDefault/tests/test_MembershipTool.py	Fri Jul  8 08:28:30 2005
@@ -17,8 +17,11 @@
 
 from unittest import TestCase, TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except: 	# BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 
 from AccessControl.SecurityManagement import newSecurityManager
 


=== Products/CMFDefault/tests/test_MetadataTool.py 1.11.2.1 => 1.11.2.2 ===
--- Products/CMFDefault/tests/test_MetadataTool.py:1.11.2.1	Wed Jun 15 06:14:30 2005
+++ Products/CMFDefault/tests/test_MetadataTool.py	Fri Jul  8 08:28:30 2005
@@ -17,8 +17,11 @@
 
 from unittest import TestCase, TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except: 	# BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 
 from Acquisition import aq_base
 


=== Products/CMFDefault/tests/test_NewsItem.py 1.12.2.1 => 1.12.2.2 ===
--- Products/CMFDefault/tests/test_NewsItem.py:1.12.2.1	Wed Jun 15 06:14:30 2005
+++ Products/CMFDefault/tests/test_NewsItem.py	Fri Jul  8 08:28:30 2005
@@ -17,8 +17,11 @@
 
 from unittest import TestCase, TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except: 	# BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 
 from Products.CMFCore.tests.base.content import BASIC_HTML
 from Products.CMFCore.tests.base.content import BASIC_STRUCTUREDTEXT


=== Products/CMFDefault/tests/test_Portal.py 1.7 => 1.7.2.1 ===
--- Products/CMFDefault/tests/test_Portal.py:1.7	Thu Aug 12 11:07:41 2004
+++ Products/CMFDefault/tests/test_Portal.py	Fri Jul  8 08:28:30 2005
@@ -17,8 +17,11 @@
 
 from unittest import TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except: 	# BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 
 from Acquisition import aq_base
 


=== Products/CMFDefault/tests/test_PropertiesTool.py 1.4.8.1 => 1.4.8.2 ===
--- Products/CMFDefault/tests/test_PropertiesTool.py:1.4.8.1	Wed Jun 15 06:14:30 2005
+++ Products/CMFDefault/tests/test_PropertiesTool.py	Fri Jul  8 08:28:30 2005
@@ -17,8 +17,11 @@
 
 from unittest import TestCase, TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except: 	# BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 
 
 class PropertiesToolTests(TestCase):


=== Products/CMFDefault/tests/test_RegistrationTool.py 1.5.6.3 => 1.5.6.4 ===
--- Products/CMFDefault/tests/test_RegistrationTool.py:1.5.6.3	Wed Jun 15 06:14:30 2005
+++ Products/CMFDefault/tests/test_RegistrationTool.py	Fri Jul  8 08:28:30 2005
@@ -17,8 +17,11 @@
 
 import unittest
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except: 	# BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 
 from Products.CMFCore.tests.base.testcase import RequestTest
 


=== Products/CMFDefault/tests/test_all.py 1.16 => 1.16.2.1 ===
--- Products/CMFDefault/tests/test_all.py:1.16	Thu Aug 12 11:07:41 2004
+++ Products/CMFDefault/tests/test_all.py	Fri Jul  8 08:28:30 2005
@@ -17,8 +17,11 @@
 
 from unittest import main
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except: 	# BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 
 from Products.CMFCore.tests.base.utils import build_test_suite
 


=== Products/CMFDefault/tests/test_join.py 1.11.8.1 => 1.11.8.2 ===
--- Products/CMFDefault/tests/test_join.py:1.11.8.1	Fri Oct 29 10:37:36 2004
+++ Products/CMFDefault/tests/test_join.py	Fri Jul  8 08:28:30 2005
@@ -1,7 +1,10 @@
 from unittest import TestSuite, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except: 	# BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 
 from Products.CMFCore.tests.base.testcase import TransactionalTest
 


=== Products/CMFDefault/tests/test_utils.py 1.12.8.3 => 1.12.8.4 ===
--- Products/CMFDefault/tests/test_utils.py:1.12.8.3	Thu Jul  7 16:19:08 2005
+++ Products/CMFDefault/tests/test_utils.py	Fri Jul  8 08:28:30 2005
@@ -1,7 +1,10 @@
 from unittest import TestCase, makeSuite, main
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except: 	# BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 
 from Products.CMFCore.tests.base.content import FAUX_HTML_LEADING_TEXT
 from Products.CMFCore.tests.base.content import SIMPLE_HTML

