[CMF-checkins] CVS: Products/CMFTopic - Topic.py:1.44.4.1

[Yvo Schubbe]

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

Modified Files:
      Tag: yuppie-post_1_5-cleanup-branch
	Topic.py 
Log Message:
- removed deprecated _getViewFor / getActionById machinery


=== Products/CMFTopic/Topic.py 1.44 => 1.44.4.1 ===
--- Products/CMFTopic/Topic.py:1.44	Thu Aug 12 11:07:42 2004
+++ Products/CMFTopic/Topic.py	Fri Sep 10 11:41:57 2004
@@ -16,11 +16,10 @@
 """
 
 from AccessControl import ClassSecurityInfo
-from Acquisition import aq_parent, aq_inner, aq_base
+from Acquisition import aq_parent, aq_inner
 from Globals import InitializeClass
 
 from Products.CMFCore.PortalFolder import PortalFolder
-from Products.CMFCore.utils import _getViewFor
 from Products.CMFCore.utils import getToolByName
 
 from permissions import ListFolderContents
@@ -108,26 +107,6 @@
 
     acquireCriteria = 1
     _criteriaTypes = []
-
-    def __call__( self ):
-
-        """ Invoke the default action.
-        """
-        view = _getViewFor( self )
-
-        if getattr( aq_base( view ), 'isDocTemp', 0 ):
-            return view(self, self.REQUEST)
-        else:
-            return view()
-
-    index_html = None  # This special value informs ZPublisher to use __call__
-
-    security.declareProtected(View, 'view')
-    def view( self ):
-
-        """ Return the default view even if index_html is overridden.
-        """
-        return self()
 
     security.declareProtected(ChangeTopics, 'listCriteria')
     def listCriteria( self ):