[Zope-Checkins] CVS: CMF/CMFCore/interfaces - portal_types.py:1.13

[Yvo Schubbe]

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

Modified Files:
	portal_types.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_types.py 1.12 => 1.13 ===
--- CMF/CMFCore/interfaces/portal_types.py:1.12	Sun Aug  4 19:10:59 2002
+++ CMF/CMFCore/interfaces/portal_types.py	Mon Jan  6 15:39:46 2003
@@ -10,14 +10,20 @@
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-""" Type registration tool interface description.
+""" Type registration 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 ContentTypeInformation(Base):
+
+class ContentTypeInformation(Interface):
     """
         Registry entry interface.
     """
@@ -74,7 +80,7 @@
             Returns the portal-relative icon for this type.
         """
 
-class portal_types(Base):
+class portal_types(Interface):
     """
         Provides a configurable registry of portal content types.
     """