Fri Jul 8 08:29:00 EDT 2005

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

Modified Files:
      Tag: CMF-1_5-branch
	test_ActionInformation.py test_ActionProviderBase.py 
	test_ActionsTool.py test_CachingPolicyManager.py 
	test_CatalogTool.py test_ContentTypeRegistry.py 
	test_DirectoryView.py test_DiscussionTool.py 
	test_DynamicType.py test_Expression.py test_FSFile.py 
	test_FSImage.py test_FSMetadata.py test_FSPageTemplate.py 
	test_FSPythonScript.py test_FSSecurity.py test_FSZSQLMethod.py 
	test_MemberDataTool.py test_MembershipTool.py 
	test_OpaqueItems.py test_RegistrationTool.py test_SkinsTool.py 
	test_TypesTool.py test_URLTool.py test_UndoTool.py 
	test_WorkflowTool.py test_all.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/CMFCore/tests/test_ActionInformation.py 1.10.2.5 => 1.10.2.6 ===

--- Products/CMFCore/tests/test_ActionInformation.py:1.10.2.5	Sun Jun 26 06:58:30 2005
+++ Products/CMFCore/tests/test_ActionInformation.py	Fri Jul  8 08:28:29 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.PythonScripts.PythonScript import manage_addPythonScript
 


=== Products/CMFCore/tests/test_ActionProviderBase.py 1.17.2.1 => 1.17.2.2 ===
--- Products/CMFCore/tests/test_ActionProviderBase.py:1.17.2.1	Wed Jun 15 06:14:29 2005
+++ Products/CMFCore/tests/test_ActionProviderBase.py	Fri Jul  8 08:28:29 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 Products.CMFCore.tests.base.dummy import DummySite
 from Products.CMFCore.tests.base.dummy import DummyTool


=== Products/CMFCore/tests/test_ActionsTool.py 1.17.2.1 => 1.17.2.2 ===
--- Products/CMFCore/tests/test_ActionsTool.py:1.17.2.1	Wed Jun 15 06:14:29 2005
+++ Products/CMFCore/tests/test_ActionsTool.py	Fri Jul  8 08:28:29 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 Products.CMFCore.MembershipTool import MembershipTool
 from Products.CMFCore.RegistrationTool import RegistrationTool


=== Products/CMFCore/tests/test_CachingPolicyManager.py 1.12.14.3 => 1.12.14.4 ===
--- Products/CMFCore/tests/test_CachingPolicyManager.py:1.12.14.3	Wed Jun 15 06:14:29 2005
+++ Products/CMFCore/tests/test_CachingPolicyManager.py	Fri Jul  8 08:28:29 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 App.Common import rfc1123_date
 from DateTime.DateTime import DateTime


=== Products/CMFCore/tests/test_CatalogTool.py 1.7.14.3 => 1.7.14.4 ===
--- Products/CMFCore/tests/test_CatalogTool.py:1.7.14.3	Wed Jun 15 06:14:29 2005
+++ Products/CMFCore/tests/test_CatalogTool.py	Fri Jul  8 08:28:29 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
 from DateTime import DateTime


=== Products/CMFCore/tests/test_ContentTypeRegistry.py 1.11.14.1 => 1.11.14.2 ===
--- Products/CMFCore/tests/test_ContentTypeRegistry.py:1.11.14.1	Wed Jun 15 06:14:29 2005
+++ Products/CMFCore/tests/test_ContentTypeRegistry.py	Fri Jul  8 08:28:29 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 MajorMinorPredicateTests( TestCase ):


=== Products/CMFCore/tests/test_DirectoryView.py 1.19.10.5 => 1.19.10.6 ===
--- Products/CMFCore/tests/test_DirectoryView.py:1.19.10.5	Tue May 24 06:41:26 2005
+++ Products/CMFCore/tests/test_DirectoryView.py	Fri Jul  8 08:28:29 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 os import remove, mkdir, rmdir
 from os.path import join


=== Products/CMFCore/tests/test_DiscussionTool.py 1.6.2.1 => 1.6.2.2 ===
--- Products/CMFCore/tests/test_DiscussionTool.py:1.6.2.1	Wed Jun 15 06:14:29 2005
+++ Products/CMFCore/tests/test_DiscussionTool.py	Fri Jul  8 08:28:29 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 DiscussionToolTests(TestCase):


=== Products/CMFCore/tests/test_DynamicType.py 1.6.14.1 => 1.6.14.2 ===
--- Products/CMFCore/tests/test_DynamicType.py:1.6.14.1	Wed Jun 15 06:14:29 2005
+++ Products/CMFCore/tests/test_DynamicType.py	Fri Jul  8 08:28:29 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 Implicit
 from ZPublisher.BaseRequest import BaseRequest


=== Products/CMFCore/tests/test_Expression.py 1.6 => 1.6.14.1 ===
--- Products/CMFCore/tests/test_Expression.py:1.6	Mon Apr 26 08:14:17 2004
+++ Products/CMFCore/tests/test_Expression.py	Fri Jul  8 08:28:29 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.ActionInformation import ActionInformation
 from Products.CMFCore.Expression import createExprContext


=== Products/CMFCore/tests/test_FSFile.py 1.8.14.3 => 1.8.14.4 ===
--- Products/CMFCore/tests/test_FSFile.py:1.8.14.3	Thu Jul  7 12:51:12 2005
+++ Products/CMFCore/tests/test_FSFile.py	Fri Jul  8 08:28:29 2005
@@ -16,8 +16,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 os.path import join as path_join
 


=== Products/CMFCore/tests/test_FSImage.py 1.10.14.3 => 1.10.14.4 ===
--- Products/CMFCore/tests/test_FSImage.py:1.10.14.3	Thu Jul  7 12:51:12 2005
+++ Products/CMFCore/tests/test_FSImage.py	Fri Jul  8 08:28:29 2005
@@ -16,8 +16,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 os.path import join as path_join
 


=== Products/CMFCore/tests/test_FSMetadata.py 1.6.14.3 => 1.6.14.4 ===
--- Products/CMFCore/tests/test_FSMetadata.py:1.6.14.3	Sun Apr  3 15:28:38 2005
+++ Products/CMFCore/tests/test_FSMetadata.py	Fri Jul  8 08:28:29 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 test_FSSecurity import FSSecurityBase
 


=== Products/CMFCore/tests/test_FSPageTemplate.py 1.14.14.4 => 1.14.14.5 ===
--- Products/CMFCore/tests/test_FSPageTemplate.py:1.14.14.4	Fri Mar 11 03:23:25 2005
+++ Products/CMFCore/tests/test_FSPageTemplate.py	Fri Jul  8 08:28:29 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 os.path import join as path_join
 


=== Products/CMFCore/tests/test_FSPythonScript.py 1.8.14.2 => 1.8.14.3 ===
--- Products/CMFCore/tests/test_FSPythonScript.py:1.8.14.2	Wed May  4 15:48:09 2005
+++ Products/CMFCore/tests/test_FSPythonScript.py	Fri Jul  8 08:28:29 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 os.path import join
 from sys import exc_info


=== Products/CMFCore/tests/test_FSSecurity.py 1.7.14.2 => 1.7.14.3 ===
--- Products/CMFCore/tests/test_FSSecurity.py:1.7.14.2	Thu Apr  7 12:37:46 2005
+++ Products/CMFCore/tests/test_FSSecurity.py	Fri Jul  8 08:28:29 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 time import sleep
 


=== Products/CMFCore/tests/test_FSZSQLMethod.py 1.1.2.2 => 1.1.2.3 ===
--- Products/CMFCore/tests/test_FSZSQLMethod.py:1.1.2.2	Wed May  4 16:32:18 2005
+++ Products/CMFCore/tests/test_FSZSQLMethod.py	Fri Jul  8 08:28:29 2005
@@ -2,8 +2,11 @@
 from os.path import join
 
 import Testing
-import Zope
-Zope.startup()
+try:
+    import Zope2
+except: 	# BBB: for Zope 2.7
+    import Zope as Zope2
+Zope2.startup()
 
 from OFS.Folder import Folder
 


=== Products/CMFCore/tests/test_MemberDataTool.py 1.5.14.2 => 1.5.14.3 ===
--- Products/CMFCore/tests/test_MemberDataTool.py:1.5.14.2	Wed Jun 15 06:14:29 2005
+++ Products/CMFCore/tests/test_MemberDataTool.py	Fri Jul  8 08:28:29 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()
 
 import Acquisition
 


=== Products/CMFCore/tests/test_MembershipTool.py 1.10.14.2 => 1.10.14.3 ===
--- Products/CMFCore/tests/test_MembershipTool.py:1.10.14.2	Thu Jul  7 14:24:19 2005
+++ Products/CMFCore/tests/test_MembershipTool.py	Fri Jul  8 08:28:29 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
 from OFS.Folder import Folder


=== Products/CMFCore/tests/test_OpaqueItems.py 1.9.2.1 => 1.9.2.2 ===
--- Products/CMFCore/tests/test_OpaqueItems.py:1.9.2.1	Sun Apr  3 15:28:38 2005
+++ Products/CMFCore/tests/test_OpaqueItems.py	Fri Jul  8 08:28:29 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.interfaces.IOpaqueItems \
     import ICallableOpaqueItem, ICallableOpaqueItemEvents


=== Products/CMFCore/tests/test_RegistrationTool.py 1.4.14.2 => 1.4.14.3 ===
--- Products/CMFCore/tests/test_RegistrationTool.py:1.4.14.2	Wed Jun 15 06:14:29 2005
+++ Products/CMFCore/tests/test_RegistrationTool.py	Fri Jul  8 08:28:29 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 RegistrationToolTests(TestCase):


=== Products/CMFCore/tests/test_SkinsTool.py 1.5.14.2 => 1.5.14.3 ===
--- Products/CMFCore/tests/test_SkinsTool.py:1.5.14.2	Wed Jun 15 06:14:29 2005
+++ Products/CMFCore/tests/test_SkinsTool.py	Fri Jul  8 08:28:29 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 SkinsContainerTests(TestCase):


=== Products/CMFCore/tests/test_TypesTool.py 1.32.2.5 => 1.32.2.6 ===
--- Products/CMFCore/tests/test_TypesTool.py:1.32.2.5	Wed Jun 15 06:14:29 2005
+++ Products/CMFCore/tests/test_TypesTool.py	Fri Jul  8 08:28:29 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 warnings import filterwarnings
 from warnings import filters


=== Products/CMFCore/tests/test_URLTool.py 1.7.14.1 => 1.7.14.2 ===
--- Products/CMFCore/tests/test_URLTool.py:1.7.14.1	Wed Jun 15 06:14:29 2005
+++ Products/CMFCore/tests/test_URLTool.py	Fri Jul  8 08:28:29 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 DummyContent
 from Products.CMFCore.tests.base.dummy import DummyFolder


=== Products/CMFCore/tests/test_UndoTool.py 1.4.14.1 => 1.4.14.2 ===
--- Products/CMFCore/tests/test_UndoTool.py:1.4.14.1	Wed Jun 15 06:14:29 2005
+++ Products/CMFCore/tests/test_UndoTool.py	Fri Jul  8 08:28:29 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 UndoToolTests(TestCase):


=== Products/CMFCore/tests/test_WorkflowTool.py 1.10.2.3 => 1.10.2.4 ===
--- Products/CMFCore/tests/test_WorkflowTool.py:1.10.2.3	Tue Jul  5 23:27:51 2005
+++ Products/CMFCore/tests/test_WorkflowTool.py	Fri Jul  8 08:28:29 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 OFS.SimpleItem import SimpleItem
 


=== Products/CMFCore/tests/test_all.py 1.28 => 1.28.2.1 ===
--- Products/CMFCore/tests/test_all.py:1.28	Thu Aug 12 11:07:40 2004
+++ Products/CMFCore/tests/test_all.py	Fri Jul  8 08:28:29 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/CMFCore/tests/test_utils.py 1.4 => 1.4.2.1 ===
--- Products/CMFCore/tests/test_utils.py:1.4	Sat Jul 31 08:58:37 2004
+++ Products/CMFCore/tests/test_utils.py	Fri Jul  8 08:28:29 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 AccessControl import getSecurityManager
 from AccessControl.Owned import Owned

