[CMF-checkins] SVN: CMF/trunk/CMF - a 1.7 is not planned, change DeprecationWarnings to show 2.0 instead.

[Jens Vagelpohl]

Log message for revision 40137:
  - a 1.7 is not planned, change DeprecationWarnings to show 2.0 instead.
  

Changed:
  U   CMF/trunk/CMFCore/ActionInformation.py
  U   CMF/trunk/CMFCore/CachingPolicyManager.py
  U   CMF/trunk/CMFCore/FSMetadata.py
  U   CMF/trunk/CMFCore/WorkflowTool.py
  U   CMF/trunk/CMFCore/interfaces/_tools.py
  U   CMF/trunk/CMFSetup/utils.py

-=-
Modified: CMF/trunk/CMFCore/ActionInformation.py
===================================================================
--- CMF/trunk/CMFCore/ActionInformation.py	2005-11-15 17:41:36 UTC (rev 40136)
+++ CMF/trunk/CMFCore/ActionInformation.py	2005-11-15 17:44:20 UTC (rev 40137)
@@ -608,7 +608,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.content_url = self.object_url = object.absolute_url()

Modified: CMF/trunk/CMFCore/CachingPolicyManager.py
===================================================================
--- CMF/trunk/CMFCore/CachingPolicyManager.py	2005-11-15 17:41:36 UTC (rev 40136)
+++ CMF/trunk/CMFCore/CachingPolicyManager.py	2005-11-15 17:44:20 UTC (rev 40137)
@@ -51,7 +51,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/trunk/CMFCore/FSMetadata.py
===================================================================
--- CMF/trunk/CMFCore/FSMetadata.py	2005-11-15 17:41:36 UTC (rev 40136)
+++ CMF/trunk/CMFCore/FSMetadata.py	2005-11-15 17:44:20 UTC (rev 40137)
@@ -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/trunk/CMFCore/WorkflowTool.py
===================================================================
--- CMF/trunk/CMFCore/WorkflowTool.py	2005-11-15 17:41:36 UTC (rev 40136)
+++ CMF/trunk/CMFCore/WorkflowTool.py	2005-11-15 17:44:20 UTC (rev 40137)
@@ -47,7 +47,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()
@@ -268,7 +268,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/trunk/CMFCore/interfaces/_tools.py
===================================================================
--- CMF/trunk/CMFCore/interfaces/_tools.py	2005-11-15 17:41:36 UTC (rev 40136)
+++ CMF/trunk/CMFCore/interfaces/_tools.py	2005-11-15 17:44:20 UTC (rev 40137)
@@ -1519,7 +1519,7 @@
         o Generate the list as though queried via
           'ActionsTool.listFilteredActionsFor'.
 
-        o This method is deprecated and will be removed in CMF 1.7.
+        o This method is deprecated and will be removed in CMF 2.0.
 
         o Permission:  Public
         """

Modified: CMF/trunk/CMFSetup/utils.py
===================================================================
--- CMF/trunk/CMFSetup/utils.py	2005-11-15 17:41:36 UTC (rev 40136)
+++ CMF/trunk/CMFSetup/utils.py	2005-11-15 17:44:20 UTC (rev 40137)
@@ -338,7 +338,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.
     """