[Zope-Checkins] CVS: CMF/CMFCore - PortalContent.py:1.40 RegistrationTool.py:1.17

[Yvo Schubbe]

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

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

=== CMF/CMFCore/PortalContent.py 1.39 => 1.40 ===
--- CMF/CMFCore/PortalContent.py:1.39	Sat Aug  3 22:31:30 2002
+++ CMF/CMFCore/PortalContent.py	Mon Jan  6 15:36:04 2003
@@ -55,9 +55,12 @@
     """
     
     if not NoWL:
-        __implements__ = (WriteLockInterface, Contentish,)
+        __implements__ = (WriteLockInterface,
+                          Contentish,
+                          DynamicType.__implements__)
     else:
-        __implements__ = (Contentish)
+        __implements__ = (Contentish, DynamicType.__implements__)
+
     isPortalContent = 1
     _isPortalContent = 1  # More reliable than 'isPortalContent'.
 
@@ -93,17 +96,16 @@
             raise ResourceLockedError, 'This resource is locked via webDAV'
         return 0
 
-    # indexed methods
-    # ---------------
-    
+    #
+    #   Contentish interface methods
+    #
     security.declareProtected(View, 'SearchableText')
     def SearchableText(self):
-        "Returns a concatination of all searchable text"
-        # Should be overriden by portal objects
-        return "%s %s" % (self.Title(), self.Description())
+        """ Returns a concatination of all searchable text.
 
-    # Contentish interface methods
-    # ----------------------------
+        Should be overriden by portal objects.
+        """
+        return "%s %s" % (self.Title(), self.Description())
 
     def __call__(self):
         '''


=== CMF/CMFCore/RegistrationTool.py 1.16 => 1.17 ===
--- CMF/CMFCore/RegistrationTool.py:1.16	Tue Aug 20 13:59:54 2002
+++ CMF/CMFCore/RegistrationTool.py	Mon Jan  6 15:36:04 2003
@@ -36,11 +36,17 @@
 from utils import getToolByName
 from utils import _dtmldir
 
+from interfaces.portal_registration \
+        import portal_registration as IRegistrationTool
+
 
 class RegistrationTool(UniqueObject, SimpleItem, ActionProviderBase):
 
     """ Create and modify users by making calls to portal_membership.
     """
+
+    __implements__ = (IRegistrationTool, ActionProviderBase.__implements__)
+
     id = 'portal_registration'
     meta_type = 'CMF Registration Tool'
 
@@ -60,10 +66,6 @@
     #
     #   'portal_registration' interface methods
     #
-    security.declarePrivate('listActions')
-    def listActions(self, info):
-        return None 
-
     security.declarePublic('isRegistrationAllowed')
     def isRegistrationAllowed(self, REQUEST):
         '''Returns a boolean value indicating whether the user