[CMF-checkins] CVS: CMF/CMFSetup/tests - conformance.py:1.7.6.1 test_actions.py:1.14.4.1

[Tres Seaver]

Update of /cvs-repository/CMF/CMFSetup/tests
In directory cvs.zope.org:/tmp/cvs-serv16776/CMFSetup/tests

Modified Files:
      Tag: tseaver-z3_interfaces-branch
	conformance.py test_actions.py 
Log Message:


Branch for Z3-ification of CMF interfaces

 - All interfaces declared in the CMF are now Zope3-style interfaces
   (the one remaining exception is to leave Zope2's
   'webdav.WriteLockInterface' declared by CMFCore.PortalContent and
   derivatives.).

TOOD

  - Clean up XXX'es noted during this pass.


=== CMF/CMFSetup/tests/conformance.py 1.7 => 1.7.6.1 ===
--- CMF/CMFSetup/tests/conformance.py:1.7	Tue Mar 15 04:34:31 2005
+++ CMF/CMFSetup/tests/conformance.py	Fri Jul 15 18:41:22 2005
@@ -23,7 +23,7 @@
     def test_ISetupContext_conformance( self ):
 
         from Products.CMFSetup.interfaces import ISetupContext
-        from Interface.Verify import verifyClass
+        from zope.interface.verify import verifyClass
 
         verifyClass( ISetupContext, self._getTargetClass() )
 
@@ -32,7 +32,7 @@
     def test_IImportContext_conformance( self ):
 
         from Products.CMFSetup.interfaces import IImportContext
-        from Interface.Verify import verifyClass
+        from zope.interface.verify import verifyClass
 
         verifyClass( IImportContext, self._getTargetClass() )
 
@@ -41,7 +41,7 @@
     def test_IExportContext_conformance( self ):
 
         from Products.CMFSetup.interfaces import IExportContext
-        from Interface.Verify import verifyClass
+        from zope.interface.verify import verifyClass
 
         verifyClass( IExportContext, self._getTargetClass() )
 
@@ -50,7 +50,7 @@
     def test_IStepRegistry_conformance( self ):
 
         from Products.CMFSetup.interfaces import IStepRegistry
-        from Interface.Verify import verifyClass
+        from zope.interface.verify import verifyClass
 
         verifyClass( IStepRegistry, self._getTargetClass() )
 
@@ -59,7 +59,7 @@
     def test_IImportStepRegistry_conformance( self ):
 
         from Products.CMFSetup.interfaces import IImportStepRegistry
-        from Interface.Verify import verifyClass
+        from zope.interface.verify import verifyClass
 
         verifyClass( IImportStepRegistry, self._getTargetClass() )
 
@@ -68,7 +68,7 @@
     def test_IExportStepRegistry_conformance( self ):
 
         from Products.CMFSetup.interfaces import IExportStepRegistry
-        from Interface.Verify import verifyClass
+        from zope.interface.verify import verifyClass
 
         verifyClass( IExportStepRegistry, self._getTargetClass() )
 
@@ -77,7 +77,7 @@
     def test_IToolsetRegistry_conformance( self ):
 
         from Products.CMFSetup.interfaces import IToolsetRegistry
-        from Interface.Verify import verifyClass
+        from zope.interface.verify import verifyClass
 
         verifyClass( IToolsetRegistry, self._getTargetClass() )
 
@@ -86,7 +86,7 @@
     def test_IProfileRegistry_conformance( self ):
 
         from Products.CMFSetup.interfaces import IProfileRegistry
-        from Interface.Verify import verifyClass
+        from zope.interface.verify import verifyClass
 
         verifyClass( IProfileRegistry, self._getTargetClass() )
 
@@ -95,6 +95,6 @@
     def test_ISetupTool_conformance( self ):
 
         from Products.CMFSetup.interfaces import ISetupTool
-        from Interface.Verify import verifyClass
+        from zope.interface.verify import verifyClass
 
         verifyClass( ISetupTool, self._getTargetClass() )


=== CMF/CMFSetup/tests/test_actions.py 1.14 => 1.14.4.1 ===
--- CMF/CMFSetup/tests/test_actions.py:1.14	Wed Jun 15 10:17:39 2005
+++ CMF/CMFSetup/tests/test_actions.py	Fri Jul 15 18:41:22 2005
@@ -24,9 +24,9 @@
 from Acquisition import aq_parent
 from OFS.Folder import Folder
 from OFS.OrderedFolder import OrderedFolder
+from zope.interface import implements
 from Products.CMFCore.ActionProviderBase import ActionProviderBase
-from Products.CMFCore.interfaces.portal_actions \
-    import ActionProvider as IActionProvider
+from Products.CMFCore.interfaces import IActionProvider
 
 from common import BaseRegistryTests
 from common import DummyExportContext
@@ -35,7 +35,7 @@
 
 class DummyTool( OrderedFolder, ActionProviderBase ):
 
-    __implements__ = ( IActionProvider, )
+    implements(IActionProvider)
 
 
 class DummyUser( Implicit ):