Commit f48d5290 authored by Florent Guillaume's avatar Florent Guillaume

Added backward compat for suppress_events parameter passing.

parent 3934c17f
...@@ -16,6 +16,7 @@ $Id$ ...@@ -16,6 +16,7 @@ $Id$
""" """
import re, sys, tempfile import re, sys, tempfile
import warnings
from cgi import escape from cgi import escape
from marshal import loads, dumps from marshal import loads, dumps
from urllib import quote, unquote from urllib import quote, unquote
...@@ -266,11 +267,27 @@ class CopyContainer(ExtensionClass.Base): ...@@ -266,11 +267,27 @@ class CopyContainer(ExtensionClass.Base):
# along to the new location if needed. # along to the new location if needed.
ob.manage_changeOwnershipType(explicit=1) ob.manage_changeOwnershipType(explicit=1)
orig_container._delObject(orig_id, suppress_events=True) 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)
ob = aq_base(ob) ob = aq_base(ob)
ob._setId(id) ob._setId(id)
self._setObject(id, ob, set_owner=0, suppress_events=True) 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)
ob = self._getOb(id) ob = self._getOb(id)
notify(ObjectMovedEvent(ob, orig_container, orig_id, self, id)) notify(ObjectMovedEvent(ob, orig_container, orig_id, self, id))
...@@ -337,13 +354,29 @@ class CopyContainer(ExtensionClass.Base): ...@@ -337,13 +354,29 @@ class CopyContainer(ExtensionClass.Base):
notify(ObjectWillBeMovedEvent(ob, self, id, self, new_id)) notify(ObjectWillBeMovedEvent(ob, self, id, self, new_id))
self._delObject(id, suppress_events=True) 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." %
self.__class__.__name__, DeprecationWarning)
ob = aq_base(ob) ob = aq_base(ob)
ob._setId(new_id) ob._setId(new_id)
# Note - because a rename always keeps the same context, we # Note - because a rename always keeps the same context, we
# can just leave the ownership info unchanged. # can just leave the ownership info unchanged.
self._setObject(new_id, ob, set_owner=0, suppress_events=True) 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." %
self.__class__.__name__, DeprecationWarning)
ob = self._getOb(new_id) ob = self._getOb(new_id)
notify(ObjectMovedEvent(ob, self, id, self, new_id)) notify(ObjectMovedEvent(ob, self, id, self, new_id))
......
...@@ -16,7 +16,7 @@ $Id$ ...@@ -16,7 +16,7 @@ $Id$
""" """
from types import StringType from types import StringType
import warnings
from AccessControl import ClassSecurityInfo from AccessControl import ClassSecurityInfo
from AccessControl.Permissions import access_contents_information from AccessControl.Permissions import access_contents_information
from AccessControl.Permissions import manage_properties from AccessControl.Permissions import manage_properties
...@@ -263,7 +263,16 @@ class OrderSupport(object): ...@@ -263,7 +263,16 @@ class OrderSupport(object):
old_position = self.getObjectPosition(id) old_position = self.getObjectPosition(id)
result = super(OrderSupport, self).manage_renameObject(id, new_id, result = super(OrderSupport, self).manage_renameObject(id, new_id,
REQUEST) REQUEST)
self.moveObjectToPosition(new_id, old_position, suppress_events=True) try:
self.moveObjectToPosition(new_id, old_position,
suppress_events=True)
except TypeError:
# BBB: removed in Zope 2.11
self.moveObjectToPosition(new_id, old_position)
warnings.warn(
"%s.moveObjectToPosition without suppress_events is "
"deprecated and will be removed in Zope 2.11." %
self.__class__.__name__, DeprecationWarning)
return result return result
def tpValues(self): def tpValues(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment