[CMF-checkins] SVN: CMF/branches/1.5/CMF - Change
DeprecationWarnings so that items slated for deprecation in
1.6 or 1.7
Jens Vagelpohl
jens at dataflake.org
Tue Nov 15 12:47:37 EST 2005
Log message for revision 40138:
- Change DeprecationWarnings so that items slated for deprecation in 1.6 or 1.7
now show 2.0.
Changed:
U CMF/branches/1.5/CMFCore/ActionInformation.py
U CMF/branches/1.5/CMFCore/ActionsTool.py
U CMF/branches/1.5/CMFCore/CachingPolicyManager.py
U CMF/branches/1.5/CMFCore/DirectoryView.py
U CMF/branches/1.5/CMFCore/FSMetadata.py
U CMF/branches/1.5/CMFCore/PortalFolder.py
U CMF/branches/1.5/CMFCore/TypesTool.py
U CMF/branches/1.5/CMFCore/WorkflowCore.py
U CMF/branches/1.5/CMFCore/WorkflowTool.py
U CMF/branches/1.5/CMFCore/interfaces/Folderish.py
U CMF/branches/1.5/CMFCore/interfaces/portal_types.py
U CMF/branches/1.5/CMFCore/interfaces/portal_workflow.py
U CMF/branches/1.5/CMFCore/utils.py
U CMF/branches/1.5/CMFSetup/typeinfo.py
U CMF/branches/1.5/CMFSetup/utils.py
-=-
Modified: CMF/branches/1.5/CMFCore/ActionInformation.py
===================================================================
--- CMF/branches/1.5/CMFCore/ActionInformation.py 2005-11-15 17:44:20 UTC (rev 40137)
+++ CMF/branches/1.5/CMFCore/ActionInformation.py 2005-11-15 17:47:37 UTC (rev 40138)
@@ -383,7 +383,7 @@
self.folder_url = self.portal_url
self.folder = portal
- # The name "content" is deprecated and will go away in CMF 1.7!
+ # The name "content" is deprecated and will go away in CMF 2.0!
self.object = self.content = object
if object is not None:
self.object_url = self.content_url = object.absolute_url()
Modified: CMF/branches/1.5/CMFCore/ActionsTool.py
===================================================================
--- CMF/branches/1.5/CMFCore/ActionsTool.py 2005-11-15 17:44:20 UTC (rev 40137)
+++ CMF/branches/1.5/CMFCore/ActionsTool.py 2005-11-15 17:47:37 UTC (rev 40138)
@@ -191,7 +191,7 @@
def _listActionInfos(self, provider, object):
""" for Action Providers written for CMF versions before 1.5
"""
- warn('ActionProvider interface not up to date. In CMF 1.6 '
+ warn('ActionProvider interface not up to date. In CMF 2.0 '
'portal_actions will ignore listActions() of \'%s\'.'
% provider.getId(),
DeprecationWarning)
Modified: CMF/branches/1.5/CMFCore/CachingPolicyManager.py
===================================================================
--- CMF/branches/1.5/CMFCore/CachingPolicyManager.py 2005-11-15 17:44:20 UTC (rev 40137)
+++ CMF/branches/1.5/CMFCore/CachingPolicyManager.py 2005-11-15 17:47:37 UTC (rev 40138)
@@ -48,7 +48,7 @@
if time is None:
time = DateTime()
- # The name "content" is deprecated and will go away in CMF 1.7,
+ # The name "content" is deprecated and will go away in CMF 2.0,
# please use "object" in your policy
data = { 'content' : content
, 'object' : content
Modified: CMF/branches/1.5/CMFCore/DirectoryView.py
===================================================================
--- CMF/branches/1.5/CMFCore/DirectoryView.py 2005-11-15 17:44:20 UTC (rev 40137)
+++ CMF/branches/1.5/CMFCore/DirectoryView.py 2005-11-15 17:47:37 UTC (rev 40138)
@@ -47,7 +47,7 @@
""" utils.expandpath() wrapper for backwards compatibility.
"""
warn('expandpath() doesn\'t belong to DirectoryView anymore and will be '
- 'removed from that module in CMF 1.6. Please import expandpath from '
+ 'removed from that module in CMF 2.0. Please import expandpath from '
'the utils module.',
DeprecationWarning)
return _new_expandpath(p)
@@ -519,7 +519,7 @@
else:
warn('createDirectoryView() expects a slash-separated path '
'relative to the Products path. \'%s\' will no longer work '
- 'in CMF 1.6.' % minimal_fp,
+ 'in CMF 2.0.' % minimal_fp,
DeprecationWarning)
minimal_fp = fixed_minimal_fp
if not id:
Modified: CMF/branches/1.5/CMFCore/FSMetadata.py
===================================================================
--- CMF/branches/1.5/CMFCore/FSMetadata.py 2005-11-15 17:44:20 UTC (rev 40137)
+++ CMF/branches/1.5/CMFCore/FSMetadata.py 2005-11-15 17:47:37 UTC (rev 40138)
@@ -159,7 +159,7 @@
except IOError:
return None
else:
- warn('.properties objects will disappear in CMF 1.7 - Use '
+ warn('.properties objects will disappear in CMF 2.0 - Use '
'.metadata objects instead.', DeprecationWarning)
lines = f.readlines()
f.close()
@@ -189,7 +189,7 @@
except IOError:
return None
else:
- warn('.security objects will disappear in CMF 1.7 - Use '
+ warn('.security objects will disappear in CMF 2.0 - Use '
'.metadata objects instead.', DeprecationWarning)
lines = f.readlines()
f.close()
Modified: CMF/branches/1.5/CMFCore/PortalFolder.py
===================================================================
--- CMF/branches/1.5/CMFCore/PortalFolder.py 2005-11-15 17:44:20 UTC (rev 40137)
+++ CMF/branches/1.5/CMFCore/PortalFolder.py 2005-11-15 17:47:37 UTC (rev 40138)
@@ -172,7 +172,7 @@
meta_types. Otherwise ensures all of the given meta types are
contentish.
'''
- warn('Using the \'spec\' argument is deprecated. In CMF 1.6 '
+ warn('Using the \'spec\' argument is deprecated. In CMF 2.0 '
'contentItems(), contentIds(), contentValues() and '
'listFolderContents() will no longer support \'spec\'. Use the '
'\'filter\' argument with \'portal_type\' instead.',
Modified: CMF/branches/1.5/CMFCore/TypesTool.py
===================================================================
--- CMF/branches/1.5/CMFCore/TypesTool.py 2005-11-15 17:44:20 UTC (rev 40137)
+++ CMF/branches/1.5/CMFCore/TypesTool.py 2005-11-15 17:47:37 UTC (rev 40138)
@@ -269,7 +269,7 @@
def getActionById( self, id, default=_marker ):
""" Get method ID by action ID.
"""
- warn('getActionById() is deprecated and will be removed in CMF 1.6. '
+ warn('getActionById() is deprecated and will be removed in CMF 2.0. '
'Please use getActionInfo()[\'url\'] if you need an URL or '
'queryMethodID() if you need a method ID.',
DeprecationWarning)
@@ -769,7 +769,7 @@
info = self.listDefaultTypeInformation()
# Nasty orkaround to stay backwards-compatible
- # This workaround will disappear in CMF 1.7
+ # This workaround will disappear in CMF 2.0
if typeinfo_name.endswith(')'):
# This is a new-style name. Proceed normally.
for (name, ft) in info:
@@ -783,7 +783,7 @@
# than one TypeInformation sharing the same meta_type.
warn('Please switch to the new format for typeinfo names '
'\"product_id: type_id (meta_type)\", the old '
- 'spelling will disappear in CMF 1.7', DeprecationWarning,
+ 'spelling will disappear in CMF 2.0', DeprecationWarning,
stacklevel=2)
ti_prod, ti_mt = [x.strip() for x in typeinfo_name.split(':')]
Modified: CMF/branches/1.5/CMFCore/WorkflowCore.py
===================================================================
--- CMF/branches/1.5/CMFCore/WorkflowCore.py 2005-11-15 17:44:20 UTC (rev 40137)
+++ CMF/branches/1.5/CMFCore/WorkflowCore.py 2005-11-15 17:47:37 UTC (rev 40138)
@@ -67,7 +67,7 @@
def __init__(self, method, id=None, reindex=1):
warn('WorkflowMethod() alias WorkflowAction() is deprecated and will '
- 'be removed in CMF 1.6.',
+ 'be removed in CMF 2.0.',
DeprecationWarning)
self._m = method
if id is None:
Modified: CMF/branches/1.5/CMFCore/WorkflowTool.py
===================================================================
--- CMF/branches/1.5/CMFCore/WorkflowTool.py 2005-11-15 17:44:20 UTC (rev 40137)
+++ CMF/branches/1.5/CMFCore/WorkflowTool.py 2005-11-15 17:47:37 UTC (rev 40138)
@@ -45,7 +45,7 @@
"""
def __init__(self, object):
warn('WorkflowInformation() is deprecated and will be removed in '
- 'CMF 1.7.',
+ 'CMF 2.0.',
DeprecationWarning)
self.object = self.content = object
self.content_url = object.absolute_url()
@@ -263,7 +263,7 @@
""" Return a list of action dictionaries for 'ob', just as though
queried via 'ActionsTool.listFilteredActionsFor'.
"""
- warn('getActionsFor() is deprecated and will be removed in CMF 1.7. '
+ warn('getActionsFor() is deprecated and will be removed in CMF 2.0. '
'Please use listActionInfos() instead.',
DeprecationWarning)
return self.listActions( WorkflowInformation( ob ) )
Modified: CMF/branches/1.5/CMFCore/interfaces/Folderish.py
===================================================================
--- CMF/branches/1.5/CMFCore/interfaces/Folderish.py 2005-11-15 17:44:20 UTC (rev 40137)
+++ CMF/branches/1.5/CMFCore/interfaces/Folderish.py 2005-11-15 17:47:37 UTC (rev 40138)
@@ -28,7 +28,7 @@
Provide a filtered view onto 'objectItems', allowing only
PortalFolders and PortalContent-derivatives to show through.
- The 'spec' argument is deprecated and will be removed in CMF 1.6.
+ The 'spec' argument is deprecated and will be removed in CMF 2.0.
Permission -- Always available (not publishable)
@@ -41,7 +41,7 @@
Provide a filtered view onto 'objectIds', allowing only PortalFolders
and PortalContent-derivatives to show through.
- The 'spec' argument is deprecated and will be removed in CMF 1.6.
+ The 'spec' argument is deprecated and will be removed in CMF 2.0.
Permission -- Always available (not publishable)
@@ -54,7 +54,7 @@
Provide a filtered view onto 'objectValues', allowing only
PortalFolders and PortalContent-derivatives to show through.
- The 'spec' argument is deprecated and will be removed in CMF 1.6.
+ The 'spec' argument is deprecated and will be removed in CMF 2.0.
Permission -- Always available (not publishable)
@@ -67,7 +67,7 @@
Hook around 'contentValues' to let 'folder_contents' be protected.
Duplicating skip_unauthorized behavior of dtml-in.
- The 'spec' argument is deprecated and will be removed in CMF 1.6.
+ The 'spec' argument is deprecated and will be removed in CMF 2.0.
Permission -- List folder contents
Modified: CMF/branches/1.5/CMFCore/interfaces/portal_types.py
===================================================================
--- CMF/branches/1.5/CMFCore/interfaces/portal_types.py 2005-11-15 17:44:20 UTC (rev 40137)
+++ CMF/branches/1.5/CMFCore/interfaces/portal_types.py 2005-11-15 17:47:37 UTC (rev 40138)
@@ -72,7 +72,7 @@
def getActionById(id):
""" Get method ID by action ID.
- This method is deprecated and will be removed in CMF 1.6. Please use
+ This method is deprecated and will be removed in CMF 2.0. Please use
getActionInfo()['url'] if you need an URL or queryMethodID() if you
need a method ID.
"""
Modified: CMF/branches/1.5/CMFCore/interfaces/portal_workflow.py
===================================================================
--- CMF/branches/1.5/CMFCore/interfaces/portal_workflow.py 2005-11-15 17:44:20 UTC (rev 40137)
+++ CMF/branches/1.5/CMFCore/interfaces/portal_workflow.py 2005-11-15 17:47:37 UTC (rev 40138)
@@ -39,7 +39,7 @@
# security.declarePublic('getActionsFor')
def getActionsFor(ob):
'''
- This method is deprecated and will be removed in CMF 1.7.
+ This method is deprecated and will be removed in CMF 2.0.
Return a list of action dictionaries for 'ob', just as though
queried via 'ActionsTool.listFilteredActionsFor'.
Modified: CMF/branches/1.5/CMFCore/utils.py
===================================================================
--- CMF/branches/1.5/CMFCore/utils.py 2005-11-15 17:44:20 UTC (rev 40137)
+++ CMF/branches/1.5/CMFCore/utils.py 2005-11-15 17:47:37 UTC (rev 40138)
@@ -151,7 +151,7 @@
security.declarePrivate('_verifyActionPermissions')
def _verifyActionPermissions(obj, action):
- # _verifyActionPermissions is deprecated and will be removed in CMF 1.6.
+ # _verifyActionPermissions is deprecated and will be removed in CMF 2.0.
# This was only used by the deprecated _getViewFor function.
pp = action.getPermissions()
if not pp:
@@ -182,7 +182,7 @@
security.declarePrivate('_getViewFor')
def _getViewFor(obj, view='view'):
warn('__call__() and view() methods using _getViewFor() as well as '
- '_getViewFor() itself are deprecated and will be removed in CMF 1.6. '
+ '_getViewFor() itself are deprecated and will be removed in CMF 2.0. '
'Bypass these methods by defining \'(Default)\' and \'view\' Method '
'Aliases.',
DeprecationWarning)
@@ -565,7 +565,7 @@
self.tools = tools
if product_name is not None:
warn("The product_name parameter of ToolInit is deprecated and "
- "will be ignored in CMF1.6: %s" % product_name,
+ "will be ignored in CMF 2.0: %s" % product_name,
DeprecationWarning, stacklevel=2)
self.product_name = product_name
self.icon = icon
@@ -765,7 +765,7 @@
def format_stx( text, level=1 ):
""" Render STX to HTML.
"""
- warn('format_stx() will be removed in CMF 1.6. Please use '
+ warn('format_stx() will be removed in CMF 2.0. Please use '
'StructuredText.StructuredText.HTML instead.',
DeprecationWarning)
return HTML(text, level=level, header=0)
Modified: CMF/branches/1.5/CMFSetup/typeinfo.py
===================================================================
--- CMF/branches/1.5/CMFSetup/typeinfo.py 2005-11-15 17:44:20 UTC (rev 40137)
+++ CMF/branches/1.5/CMFSetup/typeinfo.py 2005-11-15 17:47:37 UTC (rev 40138)
@@ -201,7 +201,7 @@
InitializeClass(TypesToolExportConfigurator)
-# BBB: will be removed in CMF 1.7
+# BBB: will be removed in CMF 2.0
class TypesToolConfigurator(TypesToolImportConfigurator,
TypesToolExportConfigurator):
def __init__(self, site, encoding=None):
@@ -211,7 +211,7 @@
InitializeClass(TypesToolConfigurator)
-# BBB: will be removed in CMF 1.7
+# BBB: will be removed in CMF 2.0
class OldTypeInfoImportConfigurator(ImportConfiguratorBase):
def _getImportMapping(self):
@@ -359,7 +359,7 @@
InitializeClass(TypeInfoExportConfigurator)
-# BBB: will be removed in CMF 1.7
+# BBB: will be removed in CMF 2.0
class TypeInfoConfigurator(TypeInfoImportConfigurator,
TypeInfoExportConfigurator):
def __init__(self, site, encoding=None):
Modified: CMF/branches/1.5/CMFSetup/utils.py
===================================================================
--- CMF/branches/1.5/CMFSetup/utils.py 2005-11-15 17:44:20 UTC (rev 40137)
+++ CMF/branches/1.5/CMFSetup/utils.py 2005-11-15 17:47:37 UTC (rev 40138)
@@ -403,7 +403,7 @@
InitializeClass(ExportConfiguratorBase)
-# BBB: old class mixing the two, will be removed in CMF 1.7
+# BBB: old class mixing the two, will be removed in CMF 2.0
class ConfiguratorBase(ImportConfiguratorBase, ExportConfiguratorBase):
""" Synthesize XML description.
"""
More information about the CMF-checkins
mailing list