[CMF-checkins] CVS: CMF/CMFCore/interfaces - portal_catalog.py:1.6.12.1 portal_discussion.py:1.6.12.1 portal_metadata.py:1.3.50.1

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFCore/interfaces
In directory cvs.zope.org:/tmp/cvs-serv8370/CMFCore/interfaces

Modified Files:
      Tag: yuppie-collector096-branch
	portal_catalog.py portal_discussion.py portal_metadata.py 
Log Message:
tool interface cleanup:
- added interface tests and made them pass

=== CMF/CMFCore/interfaces/portal_catalog.py 1.6 => 1.6.12.1 ===
--- CMF/CMFCore/interfaces/portal_catalog.py:1.6	Thu Aug  1 15:05:12 2002
+++ CMF/CMFCore/interfaces/portal_catalog.py	Thu Dec 19 17:09:03 2002
@@ -10,15 +10,20 @@
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-""" Catalog tool interface description.
+""" Catalog tool interface.
 
 $Id$
 """
 
+from Interface import Attribute
+try:
+    from Interface import Interface
+except ImportError:
+    # for Zope versions before 2.6.0
+    from Interface import Base as Interface
 
-from Interface import Attribute, Base
 
-class portal_catalog(Base):
+class portal_catalog(Interface):
     '''This tool interacts with a customized ZCatalog.
     '''
     id = Attribute('id', 'Must be set to "portal_catalog"')


=== CMF/CMFCore/interfaces/portal_discussion.py 1.6 => 1.6.12.1 ===
--- CMF/CMFCore/interfaces/portal_discussion.py:1.6	Thu Aug  1 15:05:12 2002
+++ CMF/CMFCore/interfaces/portal_discussion.py	Thu Dec 19 17:09:03 2002
@@ -10,16 +10,21 @@
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-""" Discussion tool interface description.
+""" Discussion tool interface.
 
 $Id$
 """
 
-from Interface import Attribute, Base
+from Interface import Attribute
+try:
+    from Interface import Interface
+except ImportError:
+    # for Zope versions before 2.6.0
+    from Interface import Base as Interface
 
-class portal_discussion(Base):
-    """
-        Links content to discussions.
+
+class oldstyle_portal_discussion(Interface):
+    """ Links content to discussions.
     """
     id = Attribute('id', 'Must be set to "portal_discussion"')
 
@@ -37,6 +42,11 @@
             up via an object-specific value, or by place, or from
             a site-wide policy.
         """
+
+
+class portal_discussion(oldstyle_portal_discussion):
+    """ Links content to discussions.
+    """
 
     #getDiscussionFor__roles__ = None
     def overrideDiscussionFor(content, allowDiscussion):


=== CMF/CMFCore/interfaces/portal_metadata.py 1.3 => 1.3.50.1 ===
--- CMF/CMFCore/interfaces/portal_metadata.py:1.3	Wed Nov 28 14:06:25 2001
+++ CMF/CMFCore/interfaces/portal_metadata.py	Thu Dec 19 17:09:03 2002
@@ -10,15 +10,20 @@
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
+""" Metadata tool interface.
 
-"""
-    Type registration tool interface description.
+$Id$
 """
 
+from Interface import Attribute
+try:
+    from Interface import Interface
+except ImportError:
+    # for Zope versions before 2.6.0
+    from Interface import Base as Interface
 
-from Interface import Attribute, Base
 
-class portal_metadata(Base):
+class portal_metadata(Interface):
     """
         CMF metadata policies interface.
     """