[CMF-checkins] CVS: Products/CMFDefault - SkinnedFolder.py:1.22 __init__.py:1.25

Yvo Schubbe y.2004_ at wcm-solutions.de
Tue Sep 14 15:02:52 EDT 2004


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

Modified Files:
	SkinnedFolder.py __init__.py 
Log Message:
Merged yuppie-post_1_5-cleanup-branch:
- removed a lot of deprecated code
- made CMFCollector work with CMF 1.4 *and* HEAD


=== Products/CMFDefault/SkinnedFolder.py 1.21 => 1.22 ===
--- Products/CMFDefault/SkinnedFolder.py:1.21	Thu Aug 12 11:07:40 2004
+++ Products/CMFDefault/SkinnedFolder.py	Tue Sep 14 15:02:21 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
 


=== Products/CMFDefault/__init__.py 1.24 => 1.25 ===
--- Products/CMFDefault/__init__.py:1.24	Thu Aug 12 11:07:40 2004
+++ Products/CMFDefault/__init__.py	Tue Sep 14 15:02:21 2004
@@ -45,10 +45,6 @@
 import DefaultWorkflow
 
 
-# Old name that some third-party packages may need.
-ADD_CONTENT_PERMISSION = AddPortalContent
-
-
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 #   N.B.:  The following symbol controls whether we "inject" the
 #          content types which formerly lived in CMFCore back into
@@ -85,7 +81,6 @@
                  , NewsItem.NewsItem
                  , SkinnedFolder.SkinnedFolder
                  )
-
 
 contentConstructors = ( Document.addDocument
                       , File.addFile



More information about the CMF-checkins mailing list