[CMF-checkins] CVS: Products/CMFTopic - DateCriteria.py:1.11.12.1 ListCriterion.py:1.15.12.1 SimpleIntCriterion.py:1.14.12.1 SimpleStringCriterion.py:1.12.12.1 SortCriterion.py:1.9.6.1 configure.zcml:1.1.8.1

[Tres Seaver]

Update of /cvs-repository/Products/CMFTopic
In directory cvs.zope.org:/tmp/cvs-serv16776/CMFTopic

Modified Files:
      Tag: tseaver-z3_interfaces-branch
	DateCriteria.py ListCriterion.py SimpleIntCriterion.py 
	SimpleStringCriterion.py SortCriterion.py configure.zcml 
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.


=== Products/CMFTopic/DateCriteria.py 1.11 => 1.11.12.1 ===
--- Products/CMFTopic/DateCriteria.py:1.11	Thu Aug 12 11:07:42 2004
+++ Products/CMFTopic/DateCriteria.py	Fri Jul 15 18:41:23 2005
@@ -19,10 +19,12 @@
 from DateTime.DateTime import DateTime
 from Globals import InitializeClass
 
+from zope.interface import implements
+
 from permissions import View
 from permissions import ChangeTopics
 from AbstractCriterion import AbstractCriterion
-from interfaces import Criterion
+from interfaces import ICriterion
 from Topic import Topic
 
 
@@ -31,7 +33,7 @@
         Put a friendly interface on date range searches, like
         'where effective date is less than 5 days old'.
     """
-    __implements__ = ( Criterion, )
+    implements(ICriterion)
 
     meta_type = 'Friendly Date Criterion'
 


=== Products/CMFTopic/ListCriterion.py 1.15 => 1.15.12.1 ===
--- Products/CMFTopic/ListCriterion.py:1.15	Thu Aug 12 11:07:42 2004
+++ Products/CMFTopic/ListCriterion.py	Fri Jul 15 18:41:23 2005
@@ -17,11 +17,12 @@
 from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
 
+from zope.interface import implements
 
 from permissions import View
 from permissions import ChangeTopics
 from AbstractCriterion import AbstractCriterion
-from interfaces import Criterion
+from interfaces import ICriterion
 from Topic import Topic
 
 
@@ -30,7 +31,7 @@
         Represent a criterion which is a list of values (for an
         'OR' search).
     """
-    __implements__ = ( Criterion, )
+    implements(ICriterion)
 
     meta_type = 'List Criterion'
     operator = None


=== Products/CMFTopic/SimpleIntCriterion.py 1.14 => 1.14.12.1 ===
--- Products/CMFTopic/SimpleIntCriterion.py:1.14	Thu Aug 12 11:07:42 2004
+++ Products/CMFTopic/SimpleIntCriterion.py	Fri Jul 15 18:41:23 2005
@@ -18,10 +18,12 @@
 from AccessControl import ClassSecurityInfo
 from Globals import InitializeClass
 
+from zope.interface import implements
+
 from permissions import View
 from permissions import ChangeTopics
 from AbstractCriterion import AbstractCriterion
-from interfaces import Criterion
+from interfaces import ICriterion
 from Topic import Topic
 
 
@@ -30,7 +32,7 @@
         Represent a simple field-match for an integer value, including
         catalog range searches.
     """
-    __implements__ = ( Criterion, )
+    implements(ICriterion)
 
     meta_type = 'Integer Criterion'
 


=== Products/CMFTopic/SimpleStringCriterion.py 1.12 => 1.12.12.1 ===
--- Products/CMFTopic/SimpleStringCriterion.py:1.12	Thu Aug 12 11:07:42 2004
+++ Products/CMFTopic/SimpleStringCriterion.py	Fri Jul 15 18:41:23 2005
@@ -17,17 +17,19 @@
 from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
 
+from zope.interface import implements
+
 from permissions import View
 from permissions import ChangeTopics
 from AbstractCriterion import AbstractCriterion
 from Topic import Topic
-from interfaces import Criterion
+from interfaces import ICriterion
 
 class SimpleStringCriterion( AbstractCriterion ):
     """
         Represent a simple field-match for a string value.
     """
-    __implements__ = ( Criterion, )
+    implements(ICriterion)
 
     meta_type = 'String Criterion'
 


=== Products/CMFTopic/SortCriterion.py 1.9 => 1.9.6.1 ===
--- Products/CMFTopic/SortCriterion.py:1.9	Thu Apr  7 12:38:47 2005
+++ Products/CMFTopic/SortCriterion.py	Fri Jul 15 18:41:23 2005
@@ -17,18 +17,20 @@
 from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
 
+from zope.interface import implements
+
 from permissions import View
 from permissions import ChangeTopics
 from AbstractCriterion import AbstractCriterion
 from Topic import Topic
-from interfaces import Criterion
+from interfaces import ICriterion
 
 class SortCriterion( AbstractCriterion ):
     """
         Represent a mock criterion, to allow spelling the sort order
         and reversal items in a catalog query.
     """
-    __implements__ = ( Criterion, )
+    implements(ICriterion)
 
     meta_type = 'Sort Criterion'
 


=== Products/CMFTopic/configure.zcml 1.1 => 1.1.8.1 ===
--- Products/CMFTopic/configure.zcml:1.1	Mon Jun 13 13:32:06 2005
+++ Products/CMFTopic/configure.zcml	Fri Jul 15 18:41:23 2005
@@ -2,6 +2,7 @@
     xmlns:five="http://namespaces.zope.org/five"
     >
 
+  <!--
   <five:bridge
       zope2=".interfaces.Criterion.Criterion"
       package=".interfaces"
@@ -32,5 +33,6 @@
       class=".SortCriterion.SortCriterion"
       interface=".interfaces.ICriterion"
       />
+   -->
 
 </configure>