Turned deprecation warnings for manage_afterAdd, manage_beforeDelete and...

Turned deprecation warnings for manage_afterAdd, manage_beforeDelete and manage_afterClone methods into discouraged warnings.

doc/CHANGES.txt

@@ -9,6 +9,11 @@ Zope Changes
 
     Restructuring
 
+      - Turned deprecation warnings for manage_afterAdd, manage_beforeDelete
+        and manage_afterClone methods into discouraged warnings. These methods
+        will not be removed in Zope 2.11, but stay for the foreseeable future.
+        Using events is still highly encouraged.
+
       - Moved two implements declarations from Five into the proper classes.
 
       - Document.sequence: replaced by zope.sequencesort

lib/python/OFS/CopySupport.py

@@ -272,24 +272,21 @@ class CopyContainer(ExtensionClass.Base):
                 try:
                     orig_container._delObject(orig_id, suppress_events=True)
                 except TypeError:
-                    # BBB: removed in Zope 2.11
                     orig_container._delObject(orig_id)
                     warnings.warn(
-                        "%s._delObject without suppress_events is deprecated "
-                        "and will be removed in Zope 2.11." %
-                        orig_container.__class__.__name__, DeprecationWarning)
+                        "%s._delObject without suppress_events is discouraged."
+                        % orig_container.__class__.__name__,
+                        DeprecationWarning)
                 ob = aq_base(ob)
                 ob._setId(id)
 
                 try:
                     self._setObject(id, ob, set_owner=0, suppress_events=True)
                 except TypeError:
-                    # BBB: removed in Zope 2.11
                     self._setObject(id, ob, set_owner=0)
                     warnings.warn(
-                        "%s._setObject without suppress_events is deprecated "
-                        "and will be removed in Zope 2.11." %
-                        self.__class__.__name__, DeprecationWarning)
+                        "%s._setObject without suppress_events is discouraged."
+                        % self.__class__.__name__, DeprecationWarning)
                 ob = self._getOb(id)
 
                 notify(ObjectMovedEvent(ob, orig_container, orig_id, self, id))
@@ -362,11 +359,9 @@ class CopyContainer(ExtensionClass.Base):
         try:
             self._delObject(id, suppress_events=True)
         except TypeError:
-            # BBB: removed in Zope 2.11
             self._delObject(id)
             warnings.warn(
-                "%s._delObject without suppress_events is deprecated "
-                "and will be removed in Zope 2.11." %
+                "%s._delObject without suppress_events is discouraged." %
                 self.__class__.__name__, DeprecationWarning)
         ob = aq_base(ob)
         ob._setId(new_id)
@@ -376,11 +371,9 @@ class CopyContainer(ExtensionClass.Base):
         try:
             self._setObject(new_id, ob, set_owner=0, suppress_events=True)
         except TypeError:
-            # BBB: removed in Zope 2.11
             self._setObject(new_id, ob, set_owner=0)
             warnings.warn(
-                "%s._setObject without suppress_events is deprecated "
-                "and will be removed in Zope 2.11." %
+                "%s._setObject without suppress_events is discouraged." %
                 self.__class__.__name__, DeprecationWarning)
         ob = self._getOb(new_id)
 

lib/python/OFS/subscribers.py

@@ -68,10 +68,8 @@ def maybeWarnDeprecated(ob, method_name):
         return
     class_ = ob.__class__
     warnings.warn(
-        "%s.%s.%s is deprecated and will be removed in Zope 2.11, "
-        "you should use event subscribers instead, and meanwhile "
-        "mark the class with <five:deprecatedManageAddDelete/>"
-        % (class_.__module__, class_.__name__, method_name),
+        "%s.%s.%s is discouraged. You should use event subscribers instead." %
+        (class_.__module__, class_.__name__, method_name),
         DeprecationWarning)
 
 ##################################################

lib/python/Products/Five/deprecated.zcml

 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:five="http://namespaces.zope.org/five">
 
-  <!-- deprecated in core Zope, should be fixed there in Zope 2.9 -->
+  <!-- deprecated in core Zope, should be fixed there -->
 
   <five:deprecatedManageAddDelete
       class="AccessControl.User.BasicUserFolder"/>

lib/python/Products/Five/doc/event.txt

@@ -10,7 +10,7 @@ happening to objects without have to subclass ``manage_afterAdd``,
 to register a subscriber for the appropriate event, for instance
 IObjectAddedEvent, and make it do the work.
 
-Indeed, the old methods like ``manage_afterAdd`` are now deprecated, you
+Indeed, the old methods like ``manage_afterAdd`` are now discouraged, you
 shouldn't use them anymore.
 
 Let's see how to migrate your products.
@@ -47,8 +47,7 @@ If you run this code in Zope 2.9, you will get deprecation warnings,
 telling you that::
 
     Calling Products.CoolProduct.CoolDocument.CoolDocument.manage_afterAdd
-    is deprecated when using Five, instead use event subscribers or mark
-    the class with <five:deprecatedManageAddDelete/>
+    is discouraged. You should use event subscribers instead.
 
 Using five:deprecatedManageAddDelete
 ------------------------------------
@@ -78,8 +77,8 @@ work of the super class will be done trough events, you must not redo it
 by hand. If you call the super class, you will get a warning, saying for
 instance::
 
-    CoolDocument.manage_afterAdd is deprecated and will be removed in
-    Zope 2.11, you should use an IObjectAddedEvent subscriber instead.
+    CoolDocument.manage_afterAdd is discouraged. You
+    should use an IObjectAddedEvent subscriber instead.
 
 The fact that you must "just do your work" is especially important for
 the rare cases where people subclass the ``manage_afterAdd`` of object

lib/python/Products/Five/eventconfigure.py

@@ -23,7 +23,7 @@ from OFS.subscribers import deprecatedManageAddDeleteClasses
 
 def setContainerEvents():
     warnings.warn("Using <five:containerEvents/> is deprecated (it is now "
-                  "the default), it will be removed in Zope 2.11",
+                  "the default).",
                   DeprecationWarning)
 
 def setDeprecatedManageAddDelete(class_):