Backported discouraged warning for manage_* events from trunk

doc/CHANGES.txt

@@ -6,6 +6,13 @@ Zope Changes
 
   Zope 2.10.5 (unreleased)
 
+    Other changes
+
+      - 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.
+
     Bugs fixed
 
       - Launchpad #147201: treat container-class in zope.conf as a string,

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)
 
 ##################################################