[CMF-checkins] CVS: CMF/CMFCore - DirectoryView.py:1.40
FSDTMLMethod.py:1.21 FSFile.py:1.8 FSImage.py:1.16
FSPageTemplate.py:1.23 FSPythonScript.py:1.24
MemberDataTool.py:1.32 PortalFolder.py:1.51 utils.py:1.46
Yvo Schubbe
cvs-admin at zope.org
Sun Dec 7 15:44:37 EST 2003
Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv16804/CMFCore
Modified Files:
DirectoryView.py FSDTMLMethod.py FSFile.py FSImage.py
FSPageTemplate.py FSPythonScript.py MemberDataTool.py
PortalFolder.py utils.py
Log Message:
Fixed some new-style ExtensionClass compatibility issues. Thanks to Dieter Maurer for his patch!
=== CMF/CMFCore/DirectoryView.py 1.39 => 1.40 ===
--- CMF/CMFCore/DirectoryView.py:1.39 Fri Nov 28 09:52:00 2003
+++ CMF/CMFCore/DirectoryView.py Sun Dec 7 15:44:05 2003
@@ -397,6 +397,8 @@
class DirectoryViewSurrogate (Folder):
+ """ Folderish DirectoryView.
+ """
meta_type = 'Filesystem Directory View'
all_meta_types = ()
=== CMF/CMFCore/FSDTMLMethod.py 1.20 => 1.21 ===
--- CMF/CMFCore/FSDTMLMethod.py:1.20 Sat Nov 1 21:17:38 2003
+++ CMF/CMFCore/FSDTMLMethod.py Sun Dec 7 15:44:05 2003
@@ -95,7 +95,7 @@
return Globals.HTML.read_raw(self)
#### The following is mainly taken from OFS/DTMLMethod.py ###
-
+
index_html=None # Prevent accidental acquisition
# Documents masquerade as functions:
@@ -121,7 +121,6 @@
security=getSecurityManager()
security.addContext(self)
try:
-
if client is None:
# Called as subtemplate, so don't need error propagation!
r = Globals.HTML.__call__(self, client, REQUEST, **kw)
@@ -159,7 +158,7 @@
Returns the cacheNamespaceKeys.
'''
return self._cache_namespace_keys
-
+
def setCacheNamespaceKeys(self, keys, REQUEST=None):
'''
Sets the list of names that should be looked up in the
@@ -179,16 +178,16 @@
return getSecurityManager().validate(inst, parent, name, value)
security.declareProtected(FTPAccess, 'manage_FTPget')
- manage_FTPget = DTMLMethod.manage_FTPget
+ manage_FTPget = DTMLMethod.manage_FTPget.im_func
security.declareProtected(ViewManagementScreens, 'PrincipiaSearchSource')
- PrincipiaSearchSource = DTMLMethod.PrincipiaSearchSource
+ PrincipiaSearchSource = DTMLMethod.PrincipiaSearchSource.im_func
security.declareProtected(ViewManagementScreens, 'document_src')
- document_src = DTMLMethod.document_src
+ document_src = DTMLMethod.document_src.im_func
security.declareProtected(ViewManagementScreens, 'manage_haveProxy')
- manage_haveProxy = DTMLMethod.manage_haveProxy
+ manage_haveProxy = DTMLMethod.manage_haveProxy.im_func
Globals.InitializeClass(FSDTMLMethod)
=== CMF/CMFCore/FSFile.py 1.7 => 1.8 ===
--- CMF/CMFCore/FSFile.py:1.7 Fri Nov 28 09:52:00 2003
+++ CMF/CMFCore/FSFile.py Sun Dec 7 15:44:05 2003
@@ -80,7 +80,7 @@
#### The following is mainly taken from OFS/File.py ###
- __str__ = File.__str__
+ __str__ = File.__str__.im_func
security.declareProtected(View, 'index_html')
def index_html(self, REQUEST, RESPONSE):
=== CMF/CMFCore/FSImage.py 1.15 => 1.16 ===
--- CMF/CMFCore/FSImage.py:1.15 Fri Nov 28 09:52:00 2003
+++ CMF/CMFCore/FSImage.py Sun Dec 7 15:44:05 2003
@@ -77,9 +77,9 @@
#### The following is mainly taken from OFS/Image.py ###
- __str__ = Image.__str__
+ __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.
=== CMF/CMFCore/FSPageTemplate.py 1.22 => 1.23 ===
--- CMF/CMFCore/FSPageTemplate.py:1.22 Mon Dec 1 04:41:10 2003
+++ CMF/CMFCore/FSPageTemplate.py Sun Dec 7 15:44:05 2003
@@ -139,7 +139,7 @@
raise
security.declarePrivate( '_ZPT_exec' )
- _ZPT_exec = ZopePageTemplate._exec
+ _ZPT_exec = ZopePageTemplate._exec.im_func
security.declarePrivate( '_exec' )
def _exec(self, bound_names, args, kw):
@@ -197,21 +197,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
+ pt_getContext = ZopePageTemplate.pt_getContext.im_func
- ZScriptHTML_tryParams = ZopePageTemplate.ZScriptHTML_tryParams
+ ZScriptHTML_tryParams = ZopePageTemplate.ZScriptHTML_tryParams.im_func
source_dot_xml = Src()
=== CMF/CMFCore/FSPythonScript.py 1.23 => 1.24 ===
--- CMF/CMFCore/FSPythonScript.py:1.23 Fri Nov 28 09:52:00 2003
+++ CMF/CMFCore/FSPythonScript.py Sun Dec 7 15:44:05 2003
@@ -204,7 +204,7 @@
def params(self): return self._params
security.declareProtected(ViewManagementScreens, 'manage_haveProxy')
- manage_haveProxy = PythonScript.manage_haveProxy
+ manage_haveProxy = PythonScript.manage_haveProxy.im_func
security.declareProtected(ViewManagementScreens, 'body')
def body(self): return self._body
=== CMF/CMFCore/MemberDataTool.py 1.31 => 1.32 ===
--- CMF/CMFCore/MemberDataTool.py:1.31 Wed Sep 24 06:02:14 2003
+++ CMF/CMFCore/MemberDataTool.py Sun Dec 7 15:44:05 2003
@@ -215,7 +215,7 @@
def registerMemberData(self, m, id):
""" Add the given member data to the _members btree.
"""
- self._members[id] = m
+ self._members[id] = aq_base(m)
security.declarePrivate('deleteMemberData')
def deleteMemberData(self, member_id):
=== CMF/CMFCore/PortalFolder.py 1.50 => 1.51 ===
--- CMF/CMFCore/PortalFolder.py:1.50 Fri Nov 28 09:52:00 2003
+++ CMF/CMFCore/PortalFolder.py Sun Dec 7 15:44:05 2003
@@ -593,5 +593,5 @@
"""
return '; '.join(self.description)
-manage_addPortalFolder = PortalFolder.manage_addPortalFolder
+manage_addPortalFolder = PortalFolder.manage_addPortalFolder.im_func
manage_addPortalFolderForm = DTMLFile( 'folderAdd', globals() )
=== CMF/CMFCore/utils.py 1.45 => 1.46 ===
--- CMF/CMFCore/utils.py:1.45 Fri Nov 28 09:52:00 2003
+++ CMF/CMFCore/utils.py Sun Dec 7 15:44:05 2003
@@ -347,8 +347,8 @@
"""
my_kw = kw.copy()
my_kw['property_extensible_schema__'] = 0
- return PropertyManager.manage_propertiesForm(self, self, REQUEST,
- *args, **my_kw)
+ form = PropertyManager.manage_propertiesForm.__of__(self)
+ return form(self, REQUEST, *args, **my_kw)
security.declarePublic('propertyLabel')
def propertyLabel(self, id):
More information about the CMF-checkins
mailing list