[CMF-checkins] CVS: CMF/CMFCore/interfaces - portal_discussion.py:1.7

[Yvo Schubbe]

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

Modified Files:
	portal_discussion.py 
Log Message:
Merged yuppie-collector096-branch:
- Cleaned up Interfaces and API Help. (Collector #96)
- Removed deprecated 'register' module and interface.

=== CMF/CMFCore/interfaces/portal_discussion.py 1.6 => 1.7 ===
--- CMF/CMFCore/interfaces/portal_discussion.py:1.6	Thu Aug  1 15:05:12 2002
+++ CMF/CMFCore/interfaces/portal_discussion.py	Mon Jan  6 15:38:40 2003
@@ -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):