[CMF-checkins] CVS: Products/CMFDefault - Portal.py:1.35.20.2 SkinnedFolder.py:1.13.4.4

[Sidnei da Silva]

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

Modified Files:
      Tag: CMF-1_4-branch
	Portal.py SkinnedFolder.py 
Log Message:

- Get rid of apply
- Behave accordingly with Zope 2.8


=== Products/CMFDefault/Portal.py 1.35.20.1 => 1.35.20.2 ===
--- Products/CMFDefault/Portal.py:1.35.20.1	Thu Apr 22 13:47:50 2004
+++ Products/CMFDefault/Portal.py	Wed Mar 16 12:57:54 2005
@@ -242,7 +242,7 @@
         if tool is None:
             return
         for t in initial_types:
-            cfm = apply(ContentFactoryMetadata, (), t)
+            cfm = ContentFactoryMetadata(**t)
             tool._setObject(t['id'], cfm)
 
     def setupMimetypes(self, p):


=== Products/CMFDefault/SkinnedFolder.py 1.13.4.3 => 1.13.4.4 ===
--- Products/CMFDefault/SkinnedFolder.py:1.13.4.3	Thu Apr 22 13:47:50 2004
+++ Products/CMFDefault/SkinnedFolder.py	Wed Mar 16 12:57:54 2005
@@ -75,7 +75,7 @@
         '''
         view = _getViewFor(self)
         if getattr(aq_base(view), 'isDocTemp', 0):
-            return apply(view, (self, self.REQUEST))
+            return view(self, self.REQUEST)
         else:
             return view()