[CMF-checkins] CVS: Products/CMFCore - FSImage.py:1.14.18.6 FSPageTemplate.py:1.18.18.9

[Tres Seaver]

Update of /cvs-repository/Products/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv9835/CMFCore

Modified Files:
      Tag: CMF-1_4-branch
	FSImage.py FSPageTemplate.py 
Log Message:

 
   - CMFCore.FSPageTemplate, CMFCore.FSImage:  Remove two more
     Z28-incompatible borrowings of bound methods from base classes
     (http://zope.org/Collectors/CMF/321)


=== Products/CMFCore/FSImage.py 1.14.18.5 => 1.14.18.6 ===
--- Products/CMFCore/FSImage.py:1.14.18.5	Wed Mar 16 12:57:53 2005
+++ Products/CMFCore/FSImage.py	Mon Apr 25 16:06:49 2005
@@ -77,6 +77,7 @@
     __str__ = Image.__str__.im_func
 
     _image_tag = Image.tag
+    _image_tag = Image.tag.im_func
     security.declareProtected(View, 'tag')
     def tag(self, *args, **kw):
         # Hook into an opportunity to reload metadata.


=== Products/CMFCore/FSPageTemplate.py 1.18.18.8 => 1.18.18.9 ===
--- Products/CMFCore/FSPageTemplate.py:1.18.18.8	Thu Oct  7 07:58:18 2004
+++ Products/CMFCore/FSPageTemplate.py	Mon Apr 25 16:06:49 2005
@@ -128,7 +128,7 @@
         return result
 
     security.declarePrivate( '_ZPT_exec' )
-    _ZPT_exec = ZopePageTemplate._exec
+    _ZPT_exec = ZopePageTemplate._exec.im_func
 
     security.declarePrivate( '_exec' )
     def _exec(self, bound_names, args, kw):
@@ -186,21 +186,21 @@
  
     # Copy over more methods
     security.declareProtected(FTPAccess, 'manage_FTPget')
-    manage_FTPget = ZopePageTemplate.manage_FTPget
+    manage_FTPget = ZopePageTemplate.manage_FTPget.im_func
 
     security.declareProtected(View, 'get_size')
-    get_size = ZopePageTemplate.get_size
+    get_size = ZopePageTemplate.get_size.im_func
     getSize = get_size
 
     security.declareProtected(ViewManagementScreens, 'PrincipiaSearchSource')
-    PrincipiaSearchSource = ZopePageTemplate.PrincipiaSearchSource
+    PrincipiaSearchSource = ZopePageTemplate.PrincipiaSearchSource.im_func
 
     security.declareProtected(ViewManagementScreens, 'document_src')
-    document_src = ZopePageTemplate.document_src
+    document_src = ZopePageTemplate.document_src.im_func
 
     pt_getContext = ZopePageTemplate.pt_getContext.im_func
 
-    ZScriptHTML_tryParams = ZopePageTemplate.ZScriptHTML_tryParams
+    ZScriptHTML_tryParams = ZopePageTemplate.ZScriptHTML_tryParams.im_func
 
 
 s = Src()