[Checkins] SVN: CMF/trunk/CMFCore/FS Forward port fix for #343 from 2.1 branch.

[Tres Seaver]

Log message for revision 76465:
  Forward port fix for #343 from 2.1 branch.

Changed:
  U   CMF/trunk/CMFCore/FSDTMLMethod.py
  U   CMF/trunk/CMFCore/FSFile.py
  U   CMF/trunk/CMFCore/FSImage.py
  U   CMF/trunk/CMFCore/FSObject.py
  U   CMF/trunk/CMFCore/FSPageTemplate.py
  U   CMF/trunk/CMFCore/FSPythonScript.py
  U   CMF/trunk/CMFCore/FSZSQLMethod.py

-=-
Modified: CMF/trunk/CMFCore/FSDTMLMethod.py
===================================================================
--- CMF/trunk/CMFCore/FSDTMLMethod.py	2007-06-07 15:38:16 UTC (rev 76464)
+++ CMF/trunk/CMFCore/FSDTMLMethod.py	2007-06-07 15:42:51 UTC (rev 76465)
@@ -48,16 +48,12 @@
     _cache_namespace_keys = ()
     _reading = 0
 
-    manage_options=(
-        (
-            {'label':'Customize', 'action':'manage_main'},
-            {'label':'View', 'action':'',
-             'help':('OFSP','DTML-DocumentOrMethod_View.stx')},
-            {'label':'Proxy', 'action':'manage_proxyForm',
-             'help':('OFSP','DTML-DocumentOrMethod_Proxy.stx')},
-            )
-            + Cacheable.manage_options
-        )
+    manage_options=({'label':'Customize', 'action':'manage_main'},
+                    {'label':'View', 'action':'',
+                     'help':('OFSP','DTML-DocumentOrMethod_View.stx')},
+                    {'label':'Proxy', 'action':'manage_proxyForm',
+                     'help':('OFSP','DTML-DocumentOrMethod_Proxy.stx')},
+                   )
 
     security = ClassSecurityInfo()
     security.declareObjectProtected(View)

Modified: CMF/trunk/CMFCore/FSFile.py
===================================================================
--- CMF/trunk/CMFCore/FSFile.py	2007-06-07 15:38:16 UTC (rev 76464)
+++ CMF/trunk/CMFCore/FSFile.py	2007-06-07 15:42:51 UTC (rev 76465)
@@ -45,9 +45,7 @@
     meta_type = 'Filesystem File'
     content_type = 'unknown/unknown'
 
-    manage_options=(
-        {'label':'Customize', 'action':'manage_main'},
-        ) + Cacheable.manage_options
+    manage_options = ({'label':'Customize', 'action':'manage_main'},)
 
     security = ClassSecurityInfo()
     security.declareObjectProtected(View)

Modified: CMF/trunk/CMFCore/FSImage.py
===================================================================
--- CMF/trunk/CMFCore/FSImage.py	2007-06-07 15:38:16 UTC (rev 76464)
+++ CMF/trunk/CMFCore/FSImage.py	2007-06-07 15:42:51 UTC (rev 76465)
@@ -43,9 +43,7 @@
     content_type = 'unknown/unknown'
     _data = None
 
-    manage_options=(
-        {'label':'Customize', 'action':'manage_main'},
-        ) + Cacheable.manage_options
+    manage_options = ({'label':'Customize', 'action':'manage_main'},)
 
     security = ClassSecurityInfo()
     security.declareObjectProtected(View)

Modified: CMF/trunk/CMFCore/FSObject.py
===================================================================
--- CMF/trunk/CMFCore/FSObject.py	2007-06-07 15:38:16 UTC (rev 76464)
+++ CMF/trunk/CMFCore/FSObject.py	2007-06-07 15:42:51 UTC (rev 76465)
@@ -225,9 +225,7 @@
 <dtml-var manage_page_footer>
 """
 
-    manage_options=(
-        {'label':'Error', 'action':'manage_showError'},
-        )
+    manage_options = ({'label':'Error', 'action':'manage_showError'},)
 
     def __init__( self, id, filepath, exc_str=''
                 , fullname=None, properties=None):

Modified: CMF/trunk/CMFCore/FSPageTemplate.py
===================================================================
--- CMF/trunk/CMFCore/FSPageTemplate.py	2007-06-07 15:38:16 UTC (rev 76464)
+++ CMF/trunk/CMFCore/FSPageTemplate.py	2007-06-07 15:42:51 UTC (rev 76465)
@@ -50,13 +50,9 @@
     meta_type = 'Filesystem Page Template'
     _owner = None  # Unowned
 
-    manage_options=(
-        (
-            {'label':'Customize', 'action':'manage_main'},
-            {'label':'Test', 'action':'ZScriptHTML_tryForm'},
-            )
-            + Cacheable.manage_options
-        )
+    manage_options=({'label':'Customize', 'action':'manage_main'},
+                    {'label':'Test', 'action':'ZScriptHTML_tryForm'},
+                   )
 
     security = ClassSecurityInfo()
     security.declareObjectProtected(View)

Modified: CMF/trunk/CMFCore/FSPythonScript.py
===================================================================
--- CMF/trunk/CMFCore/FSPythonScript.py	2007-06-07 15:38:16 UTC (rev 76464)
+++ CMF/trunk/CMFCore/FSPythonScript.py	2007-06-07 15:42:51 UTC (rev 76465)
@@ -94,15 +94,10 @@
     _proxy_roles = ()
     _owner = None  # Unowned
 
-    manage_options=(
-        (
-            {'label':'Customize', 'action':'manage_main'},
-            {'label':'Test',
-             'action':'ZScriptHTML_tryForm',
-             'help': ('PythonScripts', 'PythonScript_test.stx')},
-            )
-            + Cacheable.manage_options
-        )
+    manage_options = ({'label':'Customize', 'action':'manage_main'},
+                      {'label':'Test', 'action':'ZScriptHTML_tryForm',
+                       'help': ('PythonScripts', 'PythonScript_test.stx')},
+                     )
 
     security = ClassSecurityInfo()
     security.declareObjectProtected(View)

Modified: CMF/trunk/CMFCore/FSZSQLMethod.py
===================================================================
--- CMF/trunk/CMFCore/FSZSQLMethod.py	2007-06-07 15:38:16 UTC (rev 76464)
+++ CMF/trunk/CMFCore/FSZSQLMethod.py	2007-06-07 15:42:51 UTC (rev 76465)
@@ -39,13 +39,10 @@
 
     meta_type = 'Filesystem Z SQL Method'
 
-    manage_options=(
-        (
-            {'label':'Customize', 'action':'manage_customise'},
-            {'label':'Test', 'action':'manage_testForm',
-             'help':('ZSQLMethods','Z-SQL-Method_Test.stx')},
-            )
-        )
+    manage_options = ({'label':'Customize', 'action':'manage_customise'},
+                      {'label':'Test', 'action':'manage_testForm',
+                       'help':('ZSQLMethods','Z-SQL-Method_Test.stx')},
+                     )
 
     security = ClassSecurityInfo()
     security.declareObjectProtected(View)