[CMF-checkins] CVS: Products/CMFDefault - SkinnedFolder.py:1.21.6.1

[Yvo Schubbe]

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

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


=== Products/CMFDefault/SkinnedFolder.py 1.21 => 1.21.6.1 ===
--- Products/CMFDefault/SkinnedFolder.py:1.21	Thu Aug 12 11:07:40 2004
+++ Products/CMFDefault/SkinnedFolder.py	Fri Sep 10 11:41:57 2004
@@ -16,12 +16,10 @@
 """
 
 from AccessControl import ClassSecurityInfo
-from Acquisition import aq_base
 from Globals import InitializeClass
 
 from Products.CMFCore.CMFCatalogAware import CMFCatalogAware
 from Products.CMFCore.PortalFolder import PortalFolder
-from Products.CMFCore.utils import _getViewFor
 
 from DublinCore import DefaultDublinCoreImpl
 from permissions import AddPortalContent
@@ -84,21 +82,6 @@
     security = ClassSecurityInfo()
 
     manage_options = PortalFolder.manage_options
-
-    def __call__(self):
-        '''
-        Invokes the default view.
-        '''
-        view = _getViewFor(self)
-        if getattr(aq_base(view), 'isDocTemp', 0):
-            return view(self, self.REQUEST)
-        else:
-            return view()
-
-    security.declareProtected(View, 'view')
-    view = __call__
-
-    index_html = None  # This special value informs ZPublisher to use __call__
 
     # XXX: maybe we should subclass from DefaultDublinCoreImpl or refactor it