[CMF-checkins] SVN: CMF/branches/1.5/ - made sure test_z3interfaces
tests don't fail if zope.interface is installed, but not Five
Yvo Schubbe
y.2005- at wcm-solutions.de
Fri Sep 9 04:40:13 EDT 2005
Log message for revision 38418:
- made sure test_z3interfaces tests don't fail if zope.interface is installed, but not Five
Changed:
U CMF/branches/1.5/CMFCalendar/tests/test_Event.py
U CMF/branches/1.5/CMFCore/tests/test_ActionInformation.py
U CMF/branches/1.5/CMFCore/tests/test_ActionProviderBase.py
U CMF/branches/1.5/CMFCore/tests/test_ActionsTool.py
U CMF/branches/1.5/CMFCore/tests/test_CachingPolicyManager.py
U CMF/branches/1.5/CMFCore/tests/test_CatalogTool.py
U CMF/branches/1.5/CMFCore/tests/test_ContentTypeRegistry.py
U CMF/branches/1.5/CMFCore/tests/test_DiscussionTool.py
U CMF/branches/1.5/CMFCore/tests/test_DynamicType.py
U CMF/branches/1.5/CMFCore/tests/test_MemberDataTool.py
U CMF/branches/1.5/CMFCore/tests/test_MembershipTool.py
U CMF/branches/1.5/CMFCore/tests/test_PortalContent.py
U CMF/branches/1.5/CMFCore/tests/test_PortalFolder.py
U CMF/branches/1.5/CMFCore/tests/test_RegistrationTool.py
U CMF/branches/1.5/CMFCore/tests/test_SkinsTool.py
U CMF/branches/1.5/CMFCore/tests/test_TypesTool.py
U CMF/branches/1.5/CMFCore/tests/test_URLTool.py
U CMF/branches/1.5/CMFCore/tests/test_UndoTool.py
U CMF/branches/1.5/CMFCore/tests/test_WorkflowTool.py
U CMF/branches/1.5/CMFDefault/tests/test_DefaultWorkflow.py
U CMF/branches/1.5/CMFDefault/tests/test_DiscussionTool.py
U CMF/branches/1.5/CMFDefault/tests/test_Discussions.py
U CMF/branches/1.5/CMFDefault/tests/test_Document.py
U CMF/branches/1.5/CMFDefault/tests/test_DublinCore.py
U CMF/branches/1.5/CMFDefault/tests/test_MembershipTool.py
U CMF/branches/1.5/CMFDefault/tests/test_MetadataTool.py
U CMF/branches/1.5/CMFDefault/tests/test_NewsItem.py
U CMF/branches/1.5/CMFDefault/tests/test_PropertiesTool.py
U CMF/branches/1.5/CMFDefault/tests/test_RegistrationTool.py
U CMF/branches/1.5/CMFTopic/tests/common.py
U CMF/branches/1.5/CMFTopic/tests/test_Topic.py
U CMF/branches/1.5/DCWorkflow/tests/test_DCWorkflow.py
-=-
Modified: CMF/branches/1.5/CMFCalendar/tests/test_Event.py
===================================================================
--- CMF/branches/1.5/CMFCalendar/tests/test_Event.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFCalendar/tests/test_Event.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -59,15 +59,15 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import ICatalogableDublinCore
+ from Products.CMFCore.interfaces import IContentish
+ from Products.CMFCore.interfaces import IDublinCore
+ from Products.CMFCore.interfaces import IDynamicType
+ from Products.CMFCore.interfaces import IMutableDublinCore
except ImportError:
# BBB: for Zope 2.7
return
from Products.CMFCalendar.Event import Event
- from Products.CMFCore.interfaces import ICatalogableDublinCore
- from Products.CMFCore.interfaces import IContentish
- from Products.CMFCore.interfaces import IDublinCore
- from Products.CMFCore.interfaces import IDynamicType
- from Products.CMFCore.interfaces import IMutableDublinCore
verifyClass(ICatalogableDublinCore, Event)
verifyClass(IContentish, Event)
Modified: CMF/branches/1.5/CMFCore/tests/test_ActionInformation.py
===================================================================
--- CMF/branches/1.5/CMFCore/tests/test_ActionInformation.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFCore/tests/test_ActionInformation.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -53,11 +53,11 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IActionInfo
except ImportError:
# BBB: for Zope 2.7
return
from Products.CMFCore.ActionInformation import ActionInfo
- from Products.CMFCore.interfaces import IActionInfo
verifyClass(IActionInfo, ActionInfo)
Modified: CMF/branches/1.5/CMFCore/tests/test_ActionProviderBase.py
===================================================================
--- CMF/branches/1.5/CMFCore/tests/test_ActionProviderBase.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFCore/tests/test_ActionProviderBase.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -85,10 +85,10 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IActionProvider
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IActionProvider
verifyClass(IActionProvider, ActionProviderBase)
Modified: CMF/branches/1.5/CMFCore/tests/test_ActionsTool.py
===================================================================
--- CMF/branches/1.5/CMFCore/tests/test_ActionsTool.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFCore/tests/test_ActionsTool.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -63,12 +63,12 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IActionProvider
+ from Products.CMFCore.interfaces import IActionsTool
except ImportError:
# BBB: for Zope 2.7
return
from Products.CMFCore.ActionsTool import ActionsTool
- from Products.CMFCore.interfaces import IActionProvider
- from Products.CMFCore.interfaces import IActionsTool
verifyClass(IActionProvider, ActionsTool)
verifyClass(IActionsTool, ActionsTool)
Modified: CMF/branches/1.5/CMFCore/tests/test_CachingPolicyManager.py
===================================================================
--- CMF/branches/1.5/CMFCore/tests/test_CachingPolicyManager.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFCore/tests/test_CachingPolicyManager.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -282,11 +282,11 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import ICachingPolicyManager
except ImportError:
# BBB: for Zope 2.7
return
from Products.CMFCore.CachingPolicyManager import CachingPolicyManager
- from Products.CMFCore.interfaces import ICachingPolicyManager
verifyClass(ICachingPolicyManager, CachingPolicyManager)
Modified: CMF/branches/1.5/CMFCore/tests/test_CatalogTool.py
===================================================================
--- CMF/branches/1.5/CMFCore/tests/test_CatalogTool.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFCore/tests/test_CatalogTool.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -46,11 +46,11 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IIndexableObjectWrapper
except ImportError:
# BBB: for Zope 2.7
return
from Products.CMFCore.CatalogTool import IndexableObjectWrapper
- from Products.CMFCore.interfaces import IIndexableObjectWrapper
verifyClass(IIndexableObjectWrapper, IndexableObjectWrapper)
@@ -78,12 +78,12 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IActionProvider
+ from Products.CMFCore.interfaces import ICatalogTool
except ImportError:
# BBB: for Zope 2.7
return
from Products.CMFCore.CatalogTool import CatalogTool
- from Products.CMFCore.interfaces import IActionProvider
- from Products.CMFCore.interfaces import ICatalogTool
verifyClass(IActionProvider, CatalogTool)
verifyClass(ICatalogTool, CatalogTool)
Modified: CMF/branches/1.5/CMFCore/tests/test_ContentTypeRegistry.py
===================================================================
--- CMF/branches/1.5/CMFCore/tests/test_ContentTypeRegistry.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFCore/tests/test_ContentTypeRegistry.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -43,11 +43,12 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces \
+ import IContentTypeRegistryPredicate
except ImportError:
# BBB: for Zope 2.7
return
from Products.CMFCore.ContentTypeRegistry import MajorMinorPredicate
- from Products.CMFCore.interfaces import IContentTypeRegistryPredicate
verifyClass(IContentTypeRegistryPredicate, MajorMinorPredicate)
@@ -103,11 +104,12 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces \
+ import IContentTypeRegistryPredicate
except ImportError:
# BBB: for Zope 2.7
return
from Products.CMFCore.ContentTypeRegistry import ExtensionPredicate
- from Products.CMFCore.interfaces import IContentTypeRegistryPredicate
verifyClass(IContentTypeRegistryPredicate, ExtensionPredicate)
@@ -159,12 +161,13 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces \
+ import IContentTypeRegistryPredicate
except ImportError:
# BBB: for Zope 2.7
return
from Products.CMFCore.ContentTypeRegistry \
import MimeTypeRegexPredicate
- from Products.CMFCore.interfaces import IContentTypeRegistryPredicate
verifyClass(IContentTypeRegistryPredicate, MimeTypeRegexPredicate)
@@ -208,11 +211,12 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces \
+ import IContentTypeRegistryPredicate
except ImportError:
# BBB: for Zope 2.7
return
from Products.CMFCore.ContentTypeRegistry import NameRegexPredicate
- from Products.CMFCore.interfaces import IContentTypeRegistryPredicate
verifyClass(IContentTypeRegistryPredicate, NameRegexPredicate)
@@ -259,11 +263,11 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IContentTypeRegistry
except ImportError:
# BBB: for Zope 2.7
return
from Products.CMFCore.ContentTypeRegistry import ContentTypeRegistry
- from Products.CMFCore.interfaces import IContentTypeRegistry
verifyClass(IContentTypeRegistry, ContentTypeRegistry)
Modified: CMF/branches/1.5/CMFCore/tests/test_DiscussionTool.py
===================================================================
--- CMF/branches/1.5/CMFCore/tests/test_DiscussionTool.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFCore/tests/test_DiscussionTool.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -40,12 +40,12 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IActionProvider
+ from Products.CMFCore.interfaces import IOldstyleDiscussionTool
except ImportError:
# BBB: for Zope 2.7
return
from Products.CMFCore.DiscussionTool import DiscussionTool
- from Products.CMFCore.interfaces import IActionProvider
- from Products.CMFCore.interfaces import IOldstyleDiscussionTool
verifyClass(IActionProvider, DiscussionTool)
verifyClass(IOldstyleDiscussionTool, DiscussionTool)
@@ -64,11 +64,11 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IOldstyleDiscussable
except ImportError:
# BBB: for Zope 2.7
return
from Products.CMFCore.DiscussionTool import OldDiscussable
- from Products.CMFCore.interfaces import IOldstyleDiscussable
verifyClass(IOldstyleDiscussable, OldDiscussable)
Modified: CMF/branches/1.5/CMFCore/tests/test_DynamicType.py
===================================================================
--- CMF/branches/1.5/CMFCore/tests/test_DynamicType.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFCore/tests/test_DynamicType.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -63,10 +63,10 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IDynamicType
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IDynamicType
verifyClass(IDynamicType, DynamicType)
Modified: CMF/branches/1.5/CMFCore/tests/test_MemberDataTool.py
===================================================================
--- CMF/branches/1.5/CMFCore/tests/test_MemberDataTool.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFCore/tests/test_MemberDataTool.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -86,11 +86,11 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IActionProvider
+ from Products.CMFCore.interfaces import IMemberDataTool
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IActionProvider
- from Products.CMFCore.interfaces import IMemberDataTool
from Products.CMFCore.MemberDataTool import MemberDataTool
verifyClass(IActionProvider, MemberDataTool)
@@ -123,10 +123,10 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IMemberData
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IMemberData
from Products.CMFCore.MemberDataTool import MemberData
verifyClass(IMemberData, MemberData)
Modified: CMF/branches/1.5/CMFCore/tests/test_MembershipTool.py
===================================================================
--- CMF/branches/1.5/CMFCore/tests/test_MembershipTool.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFCore/tests/test_MembershipTool.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -50,11 +50,11 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IActionProvider
+ from Products.CMFCore.interfaces import IMembershipTool
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IActionProvider
- from Products.CMFCore.interfaces import IMembershipTool
from Products.CMFCore.MembershipTool import MembershipTool
verifyClass(IActionProvider, MembershipTool)
Modified: CMF/branches/1.5/CMFCore/tests/test_PortalContent.py
===================================================================
--- CMF/branches/1.5/CMFCore/tests/test_PortalContent.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFCore/tests/test_PortalContent.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -53,11 +53,11 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IContentish
+ from Products.CMFCore.interfaces import IDynamicType
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IContentish
- from Products.CMFCore.interfaces import IDynamicType
from Products.CMFCore.PortalContent import PortalContent
verifyClass(IContentish, PortalContent)
Modified: CMF/branches/1.5/CMFCore/tests/test_PortalFolder.py
===================================================================
--- CMF/branches/1.5/CMFCore/tests/test_PortalFolder.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFCore/tests/test_PortalFolder.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -149,11 +149,11 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IDynamicType
+ from Products.CMFCore.interfaces import IFolderish
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IDynamicType
- from Products.CMFCore.interfaces import IFolderish
from Products.CMFCore.PortalFolder import PortalFolder
verifyClass(IDynamicType, PortalFolder)
Modified: CMF/branches/1.5/CMFCore/tests/test_RegistrationTool.py
===================================================================
--- CMF/branches/1.5/CMFCore/tests/test_RegistrationTool.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFCore/tests/test_RegistrationTool.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -45,11 +45,11 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IActionProvider
+ from Products.CMFCore.interfaces import IRegistrationTool
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IActionProvider
- from Products.CMFCore.interfaces import IRegistrationTool
from Products.CMFCore.RegistrationTool import RegistrationTool
verifyClass(IActionProvider, RegistrationTool)
Modified: CMF/branches/1.5/CMFCore/tests/test_SkinsTool.py
===================================================================
--- CMF/branches/1.5/CMFCore/tests/test_SkinsTool.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFCore/tests/test_SkinsTool.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -37,10 +37,10 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import ISkinsContainer
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import ISkinsContainer
from Products.CMFCore.SkinsContainer import SkinsContainer
verifyClass(ISkinsContainer, SkinsContainer)
@@ -70,12 +70,12 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IActionProvider
+ from Products.CMFCore.interfaces import ISkinsContainer
+ from Products.CMFCore.interfaces import ISkinsTool
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IActionProvider
- from Products.CMFCore.interfaces import ISkinsContainer
- from Products.CMFCore.interfaces import ISkinsTool
from Products.CMFCore.SkinsTool import SkinsTool
verifyClass(IActionProvider, SkinsTool)
Modified: CMF/branches/1.5/CMFCore/tests/test_TypesTool.py
===================================================================
--- CMF/branches/1.5/CMFCore/tests/test_TypesTool.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFCore/tests/test_TypesTool.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -92,11 +92,11 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IActionProvider
+ from Products.CMFCore.interfaces import ITypesTool
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IActionProvider
- from Products.CMFCore.interfaces import ITypesTool
from Products.CMFCore.TypesTool import TypesTool
verifyClass(IActionProvider, TypesTool)
@@ -524,10 +524,10 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import ITypeInformation
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import ITypeInformation
from Products.CMFCore.TypesTool import FactoryTypeInformation
verifyClass(ITypeInformation, FactoryTypeInformation)
@@ -563,10 +563,10 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import ITypeInformation
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import ITypeInformation
from Products.CMFCore.TypesTool import ScriptableTypeInformation
verifyClass(ITypeInformation, ScriptableTypeInformation)
Modified: CMF/branches/1.5/CMFCore/tests/test_URLTool.py
===================================================================
--- CMF/branches/1.5/CMFCore/tests/test_URLTool.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFCore/tests/test_URLTool.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -53,11 +53,11 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IActionProvider
+ from Products.CMFCore.interfaces import IURLTool
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IActionProvider
- from Products.CMFCore.interfaces import IURLTool
from Products.CMFCore.URLTool import URLTool
verifyClass(IActionProvider, URLTool)
Modified: CMF/branches/1.5/CMFCore/tests/test_UndoTool.py
===================================================================
--- CMF/branches/1.5/CMFCore/tests/test_UndoTool.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFCore/tests/test_UndoTool.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -40,11 +40,11 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IActionProvider
+ from Products.CMFCore.interfaces import IUndoTool
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IActionProvider
- from Products.CMFCore.interfaces import IUndoTool
from Products.CMFCore.UndoTool import UndoTool
verifyClass(IActionProvider, UndoTool)
Modified: CMF/branches/1.5/CMFCore/tests/test_WorkflowTool.py
===================================================================
--- CMF/branches/1.5/CMFCore/tests/test_WorkflowTool.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFCore/tests/test_WorkflowTool.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -186,11 +186,11 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IActionProvider
+ from Products.CMFCore.interfaces import IWorkflowTool
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IActionProvider
- from Products.CMFCore.interfaces import IWorkflowTool
from Products.CMFCore.WorkflowTool import WorkflowTool
verifyClass(IActionProvider, WorkflowTool)
Modified: CMF/branches/1.5/CMFDefault/tests/test_DefaultWorkflow.py
===================================================================
--- CMF/branches/1.5/CMFDefault/tests/test_DefaultWorkflow.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFDefault/tests/test_DefaultWorkflow.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -61,10 +61,10 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IWorkflowDefinition
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IWorkflowDefinition
from Products.CMFDefault.DefaultWorkflow \
import DefaultWorkflowDefinition
Modified: CMF/branches/1.5/CMFDefault/tests/test_DiscussionTool.py
===================================================================
--- CMF/branches/1.5/CMFDefault/tests/test_DiscussionTool.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFDefault/tests/test_DiscussionTool.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -54,11 +54,11 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IActionProvider
+ from Products.CMFCore.interfaces import IDiscussionTool
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IActionProvider
- from Products.CMFCore.interfaces import IDiscussionTool
from Products.CMFDefault.DiscussionTool import DiscussionTool
verifyClass(IActionProvider, DiscussionTool)
Modified: CMF/branches/1.5/CMFDefault/tests/test_Discussions.py
===================================================================
--- CMF/branches/1.5/CMFDefault/tests/test_Discussions.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFDefault/tests/test_Discussions.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -65,15 +65,15 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import ICatalogableDublinCore
+ from Products.CMFCore.interfaces import IContentish
+ from Products.CMFCore.interfaces import IDiscussionResponse
+ from Products.CMFCore.interfaces import IDublinCore
+ from Products.CMFCore.interfaces import IDynamicType
+ from Products.CMFCore.interfaces import IMutableDublinCore
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import ICatalogableDublinCore
- from Products.CMFCore.interfaces import IContentish
- from Products.CMFCore.interfaces import IDiscussionResponse
- from Products.CMFCore.interfaces import IDublinCore
- from Products.CMFCore.interfaces import IDynamicType
- from Products.CMFCore.interfaces import IMutableDublinCore
from Products.CMFDefault.DiscussionItem import DiscussionItem
verifyClass(ICatalogableDublinCore, DiscussionItem)
@@ -97,10 +97,10 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IDiscussable
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IDiscussable
from Products.CMFDefault.DiscussionItem import DiscussionItemContainer
verifyClass(IDiscussable, DiscussionItemContainer)
Modified: CMF/branches/1.5/CMFDefault/tests/test_Document.py
===================================================================
--- CMF/branches/1.5/CMFDefault/tests/test_Document.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFDefault/tests/test_Document.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -95,17 +95,17 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import ICatalogableDublinCore
+ from Products.CMFCore.interfaces import IContentish
+ from Products.CMFCore.interfaces import IDublinCore
+ from Products.CMFCore.interfaces import IDynamicType
+ from Products.CMFCore.interfaces import IMutableDublinCore
+ from Products.CMFDefault.interfaces import IDocument
+ from Products.CMFDefault.interfaces import IMutableDocument
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import ICatalogableDublinCore
- from Products.CMFCore.interfaces import IContentish
- from Products.CMFCore.interfaces import IDublinCore
- from Products.CMFCore.interfaces import IDynamicType
- from Products.CMFCore.interfaces import IMutableDublinCore
from Products.CMFDefault.Document import Document
- from Products.CMFDefault.interfaces import IDocument
- from Products.CMFDefault.interfaces import IMutableDocument
verifyClass(ICatalogableDublinCore, Document)
verifyClass(IContentish, Document)
Modified: CMF/branches/1.5/CMFDefault/tests/test_DublinCore.py
===================================================================
--- CMF/branches/1.5/CMFDefault/tests/test_DublinCore.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFDefault/tests/test_DublinCore.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -88,12 +88,12 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import ICatalogableDublinCore
+ from Products.CMFCore.interfaces import IDublinCore
+ from Products.CMFCore.interfaces import IMutableDublinCore
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import ICatalogableDublinCore
- from Products.CMFCore.interfaces import IDublinCore
- from Products.CMFCore.interfaces import IMutableDublinCore
from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
verifyClass(ICatalogableDublinCore, DefaultDublinCoreImpl)
Modified: CMF/branches/1.5/CMFDefault/tests/test_MembershipTool.py
===================================================================
--- CMF/branches/1.5/CMFDefault/tests/test_MembershipTool.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFDefault/tests/test_MembershipTool.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -58,11 +58,11 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IActionProvider
+ from Products.CMFDefault.interfaces import IMembershipTool
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IActionProvider
- from Products.CMFDefault.interfaces import IMembershipTool
from Products.CMFDefault.MembershipTool import MembershipTool
verifyClass(IActionProvider, MembershipTool)
Modified: CMF/branches/1.5/CMFDefault/tests/test_MetadataTool.py
===================================================================
--- CMF/branches/1.5/CMFDefault/tests/test_MetadataTool.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFDefault/tests/test_MetadataTool.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -142,11 +142,11 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IActionProvider
+ from Products.CMFCore.interfaces import IMetadataTool
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IActionProvider
- from Products.CMFCore.interfaces import IMetadataTool
verifyClass(IActionProvider, MetadataTool)
verifyClass(IMetadataTool, MetadataTool)
Modified: CMF/branches/1.5/CMFDefault/tests/test_NewsItem.py
===================================================================
--- CMF/branches/1.5/CMFDefault/tests/test_NewsItem.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFDefault/tests/test_NewsItem.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -61,14 +61,14 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import ICatalogableDublinCore
+ from Products.CMFCore.interfaces import IContentish
+ from Products.CMFCore.interfaces import IDublinCore
+ from Products.CMFCore.interfaces import IDynamicType
+ from Products.CMFCore.interfaces import IMutableDublinCore
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import ICatalogableDublinCore
- from Products.CMFCore.interfaces import IContentish
- from Products.CMFCore.interfaces import IDublinCore
- from Products.CMFCore.interfaces import IDynamicType
- from Products.CMFCore.interfaces import IMutableDublinCore
from Products.CMFDefault.NewsItem import NewsItem
verifyClass(ICatalogableDublinCore, NewsItem)
Modified: CMF/branches/1.5/CMFDefault/tests/test_PropertiesTool.py
===================================================================
--- CMF/branches/1.5/CMFDefault/tests/test_PropertiesTool.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFDefault/tests/test_PropertiesTool.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -40,11 +40,11 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IActionProvider
+ from Products.CMFCore.interfaces import IPropertiesTool
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IActionProvider
- from Products.CMFCore.interfaces import IPropertiesTool
from Products.CMFDefault.PropertiesTool import PropertiesTool
verifyClass(IActionProvider, PropertiesTool)
Modified: CMF/branches/1.5/CMFDefault/tests/test_RegistrationTool.py
===================================================================
--- CMF/branches/1.5/CMFDefault/tests/test_RegistrationTool.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFDefault/tests/test_RegistrationTool.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -55,11 +55,11 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IActionProvider
+ from Products.CMFCore.interfaces import IRegistrationTool
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IActionProvider
- from Products.CMFCore.interfaces import IRegistrationTool
verifyClass(IActionProvider, self._getTargetClass())
verifyClass(IRegistrationTool, self._getTargetClass())
Modified: CMF/branches/1.5/CMFTopic/tests/common.py
===================================================================
--- CMF/branches/1.5/CMFTopic/tests/common.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFTopic/tests/common.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -32,9 +32,9 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFTopic.interfaces import ICriterion
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFTopic.interfaces import ICriterion
verifyClass( ICriterion, self._getTargetClass() )
Modified: CMF/branches/1.5/CMFTopic/tests/test_Topic.py
===================================================================
--- CMF/branches/1.5/CMFTopic/tests/test_Topic.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/CMFTopic/tests/test_Topic.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -170,11 +170,11 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IDynamicType
+ from Products.CMFCore.interfaces import IFolderish
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IDynamicType
- from Products.CMFCore.interfaces import IFolderish
from Products.CMFTopic.Topic import Topic
verifyClass(IDynamicType, Topic)
Modified: CMF/branches/1.5/DCWorkflow/tests/test_DCWorkflow.py
===================================================================
--- CMF/branches/1.5/DCWorkflow/tests/test_DCWorkflow.py 2005-09-09 08:35:19 UTC (rev 38417)
+++ CMF/branches/1.5/DCWorkflow/tests/test_DCWorkflow.py 2005-09-09 08:40:13 UTC (rev 38418)
@@ -52,10 +52,10 @@
def test_z3interfaces(self):
try:
from zope.interface.verify import verifyClass
+ from Products.CMFCore.interfaces import IWorkflowDefinition
except ImportError:
# BBB: for Zope 2.7
return
- from Products.CMFCore.interfaces import IWorkflowDefinition
from Products.DCWorkflow.DCWorkflow import DCWorkflowDefinition
verifyClass(IWorkflowDefinition, DCWorkflowDefinition)
More information about the CMF-checkins
mailing list