Maj import

[Plinn.git] / Folder.py

diff --git a/Folder.py b/Folder.py
index 15423a7786097cda5712884aa00dca9776893740..0d395be32ef925fc6bbc9eba4531e58e571c4094 100644 (file)
--- a/Folder.py
+++ b/Folder.py
@@ -35,8 +35,13 @@ from ZODB.POSException import ConflictError
 import OFS.subscribers
 from zope.event import notify
 from zope.lifecycleevent import ObjectCopiedEvent
 import OFS.subscribers
 from zope.event import notify
 from zope.lifecycleevent import ObjectCopiedEvent

-# from zope.app.container.contained import ObjectMovedEvent
-# from zope.app.container.contained import notifyContainerModified
+try :
+       from zope.app.container.contained import notifyContainerModified
+       from zope.app.container.contained import ObjectMovedEvent
+except ImportError :
+       ## Zope-2.13 compat
+       from zope.container.contained import notifyContainerModified
+       from zope.container.contained import ObjectMovedEvent

 from OFS.event import ObjectClonedEvent
 from OFS.event import ObjectWillBeMovedEvent
 from zope.component.factory import Factory
 from OFS.event import ObjectClonedEvent
 from OFS.event import ObjectWillBeMovedEvent
 from zope.component.factory import Factory