[CMF-checkins] SVN: CMF/branches/1.6/ Deprecation / security mismatch cleanups, forward ported from 1.5. branch.

[Tres Seaver]

Log message for revision 40636:
  Deprecation / security mismatch cleanups, forward ported from 1.5. branch.

Changed:
  U   CMF/branches/1.6/CMFCore/PortalContent.py
  U   CMF/branches/1.6/DCWorkflow/exportimport.py

-=-
Modified: CMF/branches/1.6/CMFCore/PortalContent.py
===================================================================
--- CMF/branches/1.6/CMFCore/PortalContent.py	2005-12-07 21:12:32 UTC (rev 40635)
+++ CMF/branches/1.6/CMFCore/PortalContent.py	2005-12-07 21:20:58 UTC (rev 40636)
@@ -72,7 +72,6 @@
     # The security for FTP methods aren't set up by default in our
     # superclasses...  :(
     security.declareProtected(FTPAccess, 'manage_FTPstat')
-    security.declareProtected(FTPAccess, 'manage_FTPget')
     security.declareProtected(FTPAccess, 'manage_FTPlist')
 
     def failIfLocked(self):

Modified: CMF/branches/1.6/DCWorkflow/exportimport.py
===================================================================
--- CMF/branches/1.6/DCWorkflow/exportimport.py	2005-12-07 21:12:32 UTC (rev 40635)
+++ CMF/branches/1.6/DCWorkflow/exportimport.py	2005-12-07 21:20:58 UTC (rev 40636)
@@ -129,7 +129,7 @@
         """
         return self._workflowConfig(workflow_id=self._obj.getId())
 
-    security.declareProtected( ManagePortal, 'generateWorkflowScripts' )
+    security.declareProtected( ManagePortal, 'getWorkflowScripts' )
     def getWorkflowScripts(self):
         """ Get workflow scripts information
         """