[CMF-checkins] CVS: Products/CMFTopic/interfaces - Criterion.py:1.7.2.1

[Yvo Schubbe]

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

Modified Files:
      Tag: CMF-1_5-branch
	Criterion.py 
Log Message:
backported newstyle (Zope 3) interfaces from HEAD:
- added ZCML-files that bridge z2 to z3 interfaces
- added conformance tests
- fixed the Criterion interface
- added missing license headers
- cleaned up related tests a bit


=== Products/CMFTopic/interfaces/Criterion.py 1.7 => 1.7.2.1 ===
--- Products/CMFTopic/interfaces/Criterion.py:1.7	Thu Aug 12 11:07:42 2004
+++ Products/CMFTopic/interfaces/Criterion.py	Wed Jun 15 06:14:30 2005
@@ -65,16 +65,17 @@
         self.edit(**command).
         """
 
-    def edit(**kw):
-        """\
-        The signature of this method should be specific to the
-        criterion.  Using the values in the attribute
-        '_editableAttributes', the Topic can apply the right
-        commands to each criteria object as its being edited without
-        having to know too much about the structure.
-        """
+# XXX: Interfaces have to specify the signature.
+##    def edit(**kw):
+##        """\
+##        The signature of this method should be specific to the
+##        criterion.  Using the values in the attribute
+##        '_editableAttributes', the Topic can apply the right
+##        commands to each criteria object as its being edited without
+##        having to know too much about the structure.
+##        """
 
-    def criteriaItems():
+    def getCriteriaItems():
         """\
         Return a sequence of key-value tuples, each representing
         a value to be injected into the query dictionary (and,