[CMF-checkins] CVS: Products/CMFCore/tests -
test_ActionInformation.py:1.13.2.1
test_ActionProviderBase.py:1.19.2.1
test_ActionsTool.py:1.19.2.1 test_CMFCatalogAware.py:1.4.2.1
test_CachingPolicyManager.py:1.15.2.1 test_CatalogTool.py:1.10.2.1
test_ContentTypeRegistry.py:1.12.2.1
test_DirectoryView.py:1.26.2.1 test_DiscussionTool.py:1.7.2.1
test_DynamicType.py:1.7.2.1 test_Expression.py:1.6.26.1
test_FSFile.py:1.10.4.1 test_FSImage.py:1.12.2.1
test_FSMetadata.py:1.9.2.1 test_FSPageTemplate.py:1.18.2.1
test_FSPythonScript.py:1.10.2.1 test_FSSecurity.py:1.9.2.1
test_FSZSQLMethod.py:1.3.2.1 test_MemberDataTool.py:1.7.2.1
test_MembershipTool.py:1.11.2.1 test_OpaqueItems.py:1.10.2.1
test_PortalContent.py:1.10.2.1 test_PortalFolder.py:1.42.2.1
test_RegistrationTool.py:1.6.2.1 test_SkinsTool.py:1.7.2.1
test_TypesTool.py:1.38.2.1 test_URLTool.py:1.8.2.1
test_UndoTool.py:1.5.2.1 test_WorkflowTool.py:1.12.2.1
test_all.py:1.28.14.1 test_utils.py:1.4.14.1
Tres Seaver
tseaver at palladion.com
Tue Jun 14 21:20:58 EDT 2005
Update of /cvs-repository/Products/CMFCore/tests
In directory cvs.zope.org:/tmp/cvs-serv9978/CMFCore/tests
Modified Files:
Tag: tseaver-z28_only-branch
test_ActionInformation.py test_ActionProviderBase.py
test_ActionsTool.py test_CMFCatalogAware.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_PortalContent.py test_PortalFolder.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:
- Zope 2.7 is dead! Long live Zope 2.8!
=== Products/CMFCore/tests/test_ActionInformation.py 1.13 => 1.13.2.1 ===
--- Products/CMFCore/tests/test_ActionInformation.py:1.13 Mon Jun 13 13:32:04 2005
+++ Products/CMFCore/tests/test_ActionInformation.py Tue Jun 14 21:20:26 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Products.PythonScripts.PythonScript import manage_addPythonScript
@@ -47,11 +47,7 @@
verifyClass(IActionCategory, ActionCategory)
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.CMFCore.ActionInformation import ActionCategory
from Products.CMFCore.interfaces import IActionCategory
@@ -84,11 +80,7 @@
verifyClass(IAction, Action)
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.CMFCore.ActionInformation import Action
from Products.CMFCore.interfaces import IAction
@@ -135,11 +127,7 @@
verifyClass(IActionInfo, ActionInfo)
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.CMFCore.ActionInformation import ActionInfo
from Products.CMFCore.interfaces import IActionInfo
@@ -262,11 +250,7 @@
verifyClass(IAction, ActionInformation)
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.CMFCore.ActionInformation import ActionInformation
from Products.CMFCore.interfaces import IAction
=== Products/CMFCore/tests/test_ActionProviderBase.py 1.19 => 1.19.2.1 ===
--- Products/CMFCore/tests/test_ActionProviderBase.py:1.19 Mon Jun 13 13:32:04 2005
+++ Products/CMFCore/tests/test_ActionProviderBase.py Tue Jun 14 21:20:26 2005
@@ -17,8 +17,8 @@
from unittest import TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Products.CMFCore.tests.base.dummy import DummySite
from Products.CMFCore.tests.base.dummy import DummyTool
@@ -80,11 +80,7 @@
verifyClass(IActionProvider, ActionProviderBase)
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.CMFCore.interfaces import IActionProvider
verifyClass(IActionProvider, ActionProviderBase)
=== Products/CMFCore/tests/test_ActionsTool.py 1.19 => 1.19.2.1 ===
--- Products/CMFCore/tests/test_ActionsTool.py:1.19 Mon Jun 13 13:32:04 2005
+++ Products/CMFCore/tests/test_ActionsTool.py Tue Jun 14 21:20:26 2005
@@ -17,8 +17,8 @@
from unittest import TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Products.CMFCore.MembershipTool import MembershipTool
from Products.CMFCore.RegistrationTool import RegistrationTool
@@ -58,11 +58,7 @@
verifyClass(IActionsTool, ActionsTool)
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.CMFCore.ActionsTool import ActionsTool
from Products.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import IActionsTool
=== Products/CMFCore/tests/test_CMFCatalogAware.py 1.4 => 1.4.2.1 ===
--- Products/CMFCore/tests/test_CMFCatalogAware.py:1.4 Fri Jun 3 13:31:33 2005
+++ Products/CMFCore/tests/test_CMFCatalogAware.py Tue Jun 14 21:20:26 2005
@@ -18,11 +18,7 @@
import unittest
import Testing
-try:
- import Zope2
-except ImportError:
- # BBB: for Zope 2.7
- import Zope as Zope2
+import Zope2
Zope2.startup()
from zExceptions import NotFound
=== Products/CMFCore/tests/test_CachingPolicyManager.py 1.15 => 1.15.2.1 ===
--- Products/CMFCore/tests/test_CachingPolicyManager.py:1.15 Mon Jun 13 13:32:04 2005
+++ Products/CMFCore/tests/test_CachingPolicyManager.py Tue Jun 14 21:20:26 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from App.Common import rfc1123_date
from DateTime.DateTime import DateTime
@@ -277,11 +277,7 @@
verifyClass(ICachingPolicyManager, CachingPolicyManager)
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.CMFCore.CachingPolicyManager import CachingPolicyManager
from Products.CMFCore.interfaces import ICachingPolicyManager
=== Products/CMFCore/tests/test_CatalogTool.py 1.10 => 1.10.2.1 ===
--- Products/CMFCore/tests/test_CatalogTool.py:1.10 Mon Jun 13 13:32:04 2005
+++ Products/CMFCore/tests/test_CatalogTool.py Tue Jun 14 21:20:26 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from AccessControl.SecurityManagement import newSecurityManager
from DateTime import DateTime
@@ -40,11 +40,7 @@
verifyClass(IIndexableObjectWrapper, IndexableObjectWrapper)
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.CMFCore.CatalogTool import IndexableObjectWrapper
from Products.CMFCore.interfaces import IIndexableObjectWrapper
@@ -72,11 +68,7 @@
verifyClass(IZCatalog, CatalogTool)
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.CMFCore.CatalogTool import CatalogTool
from Products.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import ICatalogTool
=== Products/CMFCore/tests/test_ContentTypeRegistry.py 1.12 => 1.12.2.1 ===
--- Products/CMFCore/tests/test_ContentTypeRegistry.py:1.12 Mon Jun 13 13:32:04 2005
+++ Products/CMFCore/tests/test_ContentTypeRegistry.py Tue Jun 14 21:20:26 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
class MajorMinorPredicateTests( TestCase ):
@@ -38,11 +38,7 @@
verifyClass(IContentTypeRegistryPredicate, MajorMinorPredicate)
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.CMFCore.ContentTypeRegistry import MajorMinorPredicate
from Products.CMFCore.interfaces import IContentTypeRegistryPredicate
@@ -98,11 +94,7 @@
verifyClass(IContentTypeRegistryPredicate, ExtensionPredicate)
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.CMFCore.ContentTypeRegistry import ExtensionPredicate
from Products.CMFCore.interfaces import IContentTypeRegistryPredicate
@@ -154,11 +146,7 @@
verifyClass(IContentTypeRegistryPredicate, MimeTypeRegexPredicate)
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.CMFCore.ContentTypeRegistry \
import MimeTypeRegexPredicate
from Products.CMFCore.interfaces import IContentTypeRegistryPredicate
@@ -203,11 +191,7 @@
verifyClass(IContentTypeRegistryPredicate, NameRegexPredicate)
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.CMFCore.ContentTypeRegistry import NameRegexPredicate
from Products.CMFCore.interfaces import IContentTypeRegistryPredicate
@@ -254,11 +238,7 @@
verifyClass(IContentTypeRegistry, ContentTypeRegistry)
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.CMFCore.ContentTypeRegistry import ContentTypeRegistry
from Products.CMFCore.interfaces import IContentTypeRegistry
=== Products/CMFCore/tests/test_DirectoryView.py 1.26 => 1.26.2.1 ===
--- Products/CMFCore/tests/test_DirectoryView.py:1.26 Tue May 24 06:41:52 2005
+++ Products/CMFCore/tests/test_DirectoryView.py Tue Jun 14 21:20:26 2005
@@ -1,7 +1,7 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from os import remove, mkdir, rmdir
from os.path import join
=== Products/CMFCore/tests/test_DiscussionTool.py 1.7 => 1.7.2.1 ===
--- Products/CMFCore/tests/test_DiscussionTool.py:1.7 Mon Jun 13 13:32:04 2005
+++ Products/CMFCore/tests/test_DiscussionTool.py Tue Jun 14 21:20:26 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
class DiscussionToolTests(TestCase):
@@ -35,11 +35,7 @@
verifyClass(IOldstyleDiscussionTool, DiscussionTool)
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.CMFCore.DiscussionTool import DiscussionTool
from Products.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import IOldstyleDiscussionTool
@@ -59,11 +55,7 @@
verifyClass(IOldDiscussable, OldDiscussable)
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.CMFCore.DiscussionTool import OldDiscussable
from Products.CMFCore.interfaces import IOldstyleDiscussable
=== Products/CMFCore/tests/test_DynamicType.py 1.7 => 1.7.2.1 ===
--- Products/CMFCore/tests/test_DynamicType.py:1.7 Mon Jun 13 13:32:04 2005
+++ Products/CMFCore/tests/test_DynamicType.py Tue Jun 14 21:20:26 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Acquisition import Implicit
from ZPublisher.BaseRequest import BaseRequest
@@ -58,11 +58,7 @@
verifyClass(IDynamicType, DynamicType)
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.CMFCore.interfaces import IDynamicType
verifyClass(IDynamicType, DynamicType)
=== Products/CMFCore/tests/test_Expression.py 1.6 => 1.6.26.1 ===
--- Products/CMFCore/tests/test_Expression.py:1.6 Mon Apr 26 08:14:17 2004
+++ Products/CMFCore/tests/test_Expression.py Tue Jun 14 21:20:26 2005
@@ -1,7 +1,23 @@
+##############################################################################
+#
+# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+""" Unit tests for Expression module.
+
+$Id$
+"""
from unittest import TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Products.CMFCore.ActionInformation import ActionInformation
from Products.CMFCore.Expression import createExprContext
=== Products/CMFCore/tests/test_FSFile.py 1.10 => 1.10.4.1 ===
--- Products/CMFCore/tests/test_FSFile.py:1.10 Sun Nov 14 18:58:30 2004
+++ Products/CMFCore/tests/test_FSFile.py Tue Jun 14 21:20:26 2005
@@ -1,7 +1,23 @@
+##############################################################################
+#
+# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+""" Unit tests for FSFile module.
+
+$Id$
+"""
import unittest
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from os.path import join as path_join
=== Products/CMFCore/tests/test_FSImage.py 1.12 => 1.12.2.1 ===
--- Products/CMFCore/tests/test_FSImage.py:1.12 Wed Jun 8 09:17:15 2005
+++ Products/CMFCore/tests/test_FSImage.py Tue Jun 14 21:20:26 2005
@@ -1,7 +1,23 @@
+##############################################################################
+#
+# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+""" Unit tests for FSImage module.
+
+$Id$
+"""
import unittest
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from os.path import join as path_join
=== Products/CMFCore/tests/test_FSMetadata.py 1.9 => 1.9.2.1 ===
--- Products/CMFCore/tests/test_FSMetadata.py:1.9 Sun Apr 3 15:29:17 2005
+++ Products/CMFCore/tests/test_FSMetadata.py Tue Jun 14 21:20:26 2005
@@ -1,7 +1,23 @@
+##############################################################################
+#
+# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+""" Unit tests for FSMetadata module.
+
+$Id$
+"""
from unittest import TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from test_FSSecurity import FSSecurityBase
=== Products/CMFCore/tests/test_FSPageTemplate.py 1.18 => 1.18.2.1 ===
--- Products/CMFCore/tests/test_FSPageTemplate.py:1.18 Fri Mar 11 03:22:55 2005
+++ Products/CMFCore/tests/test_FSPageTemplate.py Tue Jun 14 21:20:26 2005
@@ -1,7 +1,23 @@
+##############################################################################
+#
+# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+""" Unit tests for FSPageTemplate module.
+
+$Id$
+"""
from unittest import TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from os.path import join as path_join
=== Products/CMFCore/tests/test_FSPythonScript.py 1.10 => 1.10.2.1 ===
--- Products/CMFCore/tests/test_FSPythonScript.py:1.10 Wed May 4 15:52:13 2005
+++ Products/CMFCore/tests/test_FSPythonScript.py Tue Jun 14 21:20:26 2005
@@ -1,7 +1,23 @@
+##############################################################################
+#
+# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+""" Unit tests for FSPythonScript module.
+
+$Id$
+"""
from unittest import TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from os.path import join
from sys import exc_info
=== Products/CMFCore/tests/test_FSSecurity.py 1.9 => 1.9.2.1 ===
--- Products/CMFCore/tests/test_FSSecurity.py:1.9 Thu Apr 7 12:38:47 2005
+++ Products/CMFCore/tests/test_FSSecurity.py Tue Jun 14 21:20:26 2005
@@ -1,7 +1,23 @@
+##############################################################################
+#
+# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+""" Unit tests for security on FS* modules.
+
+$Id$
+"""
from unittest import TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from time import sleep
=== Products/CMFCore/tests/test_FSZSQLMethod.py 1.3 => 1.3.2.1 ===
--- Products/CMFCore/tests/test_FSZSQLMethod.py:1.3 Wed May 4 16:35:28 2005
+++ Products/CMFCore/tests/test_FSZSQLMethod.py Tue Jun 14 21:20:26 2005
@@ -2,8 +2,8 @@
from os.path import join
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from OFS.Folder import Folder
=== Products/CMFCore/tests/test_MemberDataTool.py 1.7 => 1.7.2.1 ===
--- Products/CMFCore/tests/test_MemberDataTool.py:1.7 Mon Jun 13 13:32:04 2005
+++ Products/CMFCore/tests/test_MemberDataTool.py Tue Jun 14 21:20:26 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
import Acquisition
@@ -81,11 +81,7 @@
verifyClass(IMemberDataTool, MemberDataTool)
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.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import IMemberDataTool
from Products.CMFCore.MemberDataTool import MemberDataTool
@@ -118,11 +114,7 @@
verifyClass(IMemberData, MemberData)
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.CMFCore.interfaces import IMemberData
from Products.CMFCore.MemberDataTool import MemberData
=== Products/CMFCore/tests/test_MembershipTool.py 1.11 => 1.11.2.1 ===
--- Products/CMFCore/tests/test_MembershipTool.py:1.11 Mon Jun 13 13:32:04 2005
+++ Products/CMFCore/tests/test_MembershipTool.py Tue Jun 14 21:20:26 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from AccessControl.SecurityManagement import newSecurityManager
@@ -44,11 +44,7 @@
verifyClass(IMembershipTool, MembershipTool)
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.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import IMembershipTool
from Products.CMFCore.MembershipTool import MembershipTool
=== Products/CMFCore/tests/test_OpaqueItems.py 1.10 => 1.10.2.1 ===
--- Products/CMFCore/tests/test_OpaqueItems.py:1.10 Sun Apr 3 15:29:17 2005
+++ Products/CMFCore/tests/test_OpaqueItems.py Tue Jun 14 21:20:26 2005
@@ -1,7 +1,23 @@
+##############################################################################
+#
+# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+""" Unit tests for IOpaqueItems implementations.
+
+$Id$
+"""
from unittest import TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Products.CMFCore.interfaces.IOpaqueItems \
import ICallableOpaqueItem, ICallableOpaqueItemEvents
=== Products/CMFCore/tests/test_PortalContent.py 1.10 => 1.10.2.1 ===
--- Products/CMFCore/tests/test_PortalContent.py:1.10 Mon Jun 13 13:32:04 2005
+++ Products/CMFCore/tests/test_PortalContent.py Tue Jun 14 21:20:26 2005
@@ -17,22 +17,14 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-try:
- import Zope2
-except ImportError:
- # BBB: for Zope 2.7
- import Zope as Zope2
+import Zope2
Zope2.startup()
from AccessControl.SecurityManagement import newSecurityManager
from AccessControl.SecurityManagement import noSecurityManager
from AccessControl.User import UnrestrictedUser
from Acquisition import aq_base
-try:
- import transaction
-except ImportError:
- # BBB: for Zope 2.7
- from Products.CMFCore.utils import transaction
+import transaction
from Products.CMFCore.tests.base.testcase import RequestTest
from Products.CMFDefault.Portal import PortalGenerator
@@ -52,11 +44,7 @@
verifyClass(IDynamicType, PortalContent)
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.CMFCore.interfaces import IContentish
from Products.CMFCore.interfaces import IDynamicType
from Products.CMFCore.PortalContent import PortalContent
=== Products/CMFCore/tests/test_PortalFolder.py 1.42 => 1.42.2.1 ===
--- Products/CMFCore/tests/test_PortalFolder.py:1.42 Mon Jun 13 13:32:04 2005
+++ Products/CMFCore/tests/test_PortalFolder.py Tue Jun 14 21:20:26 2005
@@ -17,11 +17,7 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-try:
- import Zope2
-except ImportError:
- # BBB: for Zope 2.7
- import Zope as Zope2
+import Zope2
Zope2.startup()
import cStringIO
@@ -35,11 +31,7 @@
from OFS.Image import manage_addFile
from OFS.tests.testCopySupport import makeConnection
from Testing.makerequest import makerequest
-try:
- import transaction
-except ImportError:
- # BBB: for Zope 2.7
- from Products.CMFCore.utils import transaction
+import transaction
from Products.CMFCore.CatalogTool import CatalogTool
from Products.CMFCore.exceptions import BadRequest
@@ -146,11 +138,7 @@
verifyClass(WriteLockInterface, PortalFolder)
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.CMFCore.interfaces import IDynamicType
from Products.CMFCore.interfaces import IFolderish
from Products.CMFCore.PortalFolder import PortalFolder
=== Products/CMFCore/tests/test_RegistrationTool.py 1.6 => 1.6.2.1 ===
--- Products/CMFCore/tests/test_RegistrationTool.py:1.6 Mon Jun 13 13:32:04 2005
+++ Products/CMFCore/tests/test_RegistrationTool.py Tue Jun 14 21:20:26 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
class RegistrationToolTests(TestCase):
@@ -40,11 +40,7 @@
verifyClass(IRegistrationTool, RegistrationTool)
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.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import IRegistrationTool
from Products.CMFCore.RegistrationTool import RegistrationTool
=== Products/CMFCore/tests/test_SkinsTool.py 1.7 => 1.7.2.1 ===
--- Products/CMFCore/tests/test_SkinsTool.py:1.7 Mon Jun 13 13:32:04 2005
+++ Products/CMFCore/tests/test_SkinsTool.py Tue Jun 14 21:20:26 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
class SkinsContainerTests(TestCase):
@@ -32,11 +32,7 @@
verifyClass(ISkinsContainer, SkinsContainer)
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.CMFCore.interfaces import ISkinsContainer
from Products.CMFCore.SkinsContainer import SkinsContainer
@@ -65,11 +61,7 @@
verifyClass(ISkinsTool, SkinsTool)
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.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import ISkinsContainer
from Products.CMFCore.interfaces import ISkinsTool
=== Products/CMFCore/tests/test_TypesTool.py 1.38 => 1.38.2.1 ===
--- Products/CMFCore/tests/test_TypesTool.py:1.38 Mon Jun 13 13:32:04 2005
+++ Products/CMFCore/tests/test_TypesTool.py Tue Jun 14 21:20:26 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from AccessControl import Unauthorized
from AccessControl.SecurityManagement import newSecurityManager
@@ -81,11 +81,7 @@
verifyClass(ITypesTool, TypesTool)
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.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import ITypesTool
from Products.CMFCore.TypesTool import TypesTool
@@ -457,11 +453,7 @@
verifyClass(ITypeInformation, FactoryTypeInformation)
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.CMFCore.interfaces import ITypeInformation
from Products.CMFCore.TypesTool import FactoryTypeInformation
@@ -496,11 +488,7 @@
verifyClass(ITypeInformation, ScriptableTypeInformation)
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.CMFCore.interfaces import ITypeInformation
from Products.CMFCore.TypesTool import ScriptableTypeInformation
=== Products/CMFCore/tests/test_URLTool.py 1.8 => 1.8.2.1 ===
--- Products/CMFCore/tests/test_URLTool.py:1.8 Mon Jun 13 13:32:04 2005
+++ Products/CMFCore/tests/test_URLTool.py Tue Jun 14 21:20:26 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Products.CMFCore.tests.base.dummy import DummyContent
from Products.CMFCore.tests.base.dummy import DummyFolder
@@ -48,11 +48,7 @@
verifyClass(IURLTool, URLTool)
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.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import IURLTool
from Products.CMFCore.URLTool import URLTool
=== Products/CMFCore/tests/test_UndoTool.py 1.5 => 1.5.2.1 ===
--- Products/CMFCore/tests/test_UndoTool.py:1.5 Mon Jun 13 13:32:04 2005
+++ Products/CMFCore/tests/test_UndoTool.py Tue Jun 14 21:20:26 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
class UndoToolTests(TestCase):
@@ -35,11 +35,7 @@
verifyClass(IUndoTool, UndoTool)
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.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import IUndoTool
from Products.CMFCore.UndoTool import UndoTool
=== Products/CMFCore/tests/test_WorkflowTool.py 1.12 => 1.12.2.1 ===
--- Products/CMFCore/tests/test_WorkflowTool.py:1.12 Mon Jun 13 13:32:04 2005
+++ Products/CMFCore/tests/test_WorkflowTool.py Tue Jun 14 21:20:26 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from OFS.SimpleItem import SimpleItem
@@ -181,11 +181,7 @@
verifyClass(IWorkflowTool, WorkflowTool)
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.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import IWorkflowTool
from Products.CMFCore.WorkflowTool import WorkflowTool
=== Products/CMFCore/tests/test_all.py 1.28 => 1.28.14.1 ===
--- Products/CMFCore/tests/test_all.py:1.28 Thu Aug 12 11:07:40 2004
+++ Products/CMFCore/tests/test_all.py Tue Jun 14 21:20:26 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
=== Products/CMFCore/tests/test_utils.py 1.4 => 1.4.14.1 ===
--- Products/CMFCore/tests/test_utils.py:1.4 Sat Jul 31 08:58:37 2004
+++ Products/CMFCore/tests/test_utils.py Tue Jun 14 21:20:26 2005
@@ -1,7 +1,7 @@
from unittest import TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from AccessControl import getSecurityManager
from AccessControl.Owned import Owned
More information about the CMF-checkins
mailing list