From b602e46730c28e3100a28f4c4e0c80b18b689c68 Mon Sep 17 00:00:00 2001
From: David Glick <david@glicksoftware.com>
Date: Wed, 5 Nov 2014 22:22:08 -0800
Subject: [PATCH] remove dependencies on zope.app.container and rwproperty

---
 CHANGES.rst                                 | 3 +++
 plone/app/versioningbehavior/behaviors.py   | 5 ++---
 plone/app/versioningbehavior/configure.zcml | 2 +-
 plone/app/versioningbehavior/subscribers.py | 2 +-
 setup.py                                    | 3 +--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index d51d7f8..9bc8fd1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,9 @@ Changelog
 1.2.1 (unreleased)
 ------------------
 
+- Remove dependencies on zope.app.container and rwproperty.
+  [davisagli]
+
 - Added Italian translations.
   [cekk]
 
diff --git a/plone/app/versioningbehavior/behaviors.py b/plone/app/versioningbehavior/behaviors.py
index adf87ad..0cfdacf 100644
--- a/plone/app/versioningbehavior/behaviors.py
+++ b/plone/app/versioningbehavior/behaviors.py
@@ -4,7 +4,6 @@
 from plone.autoform.interfaces import IFormFieldProvider
 from plone.dexterity.interfaces import IDexterityContent
 from plone.supermodel import model
-from rwproperty import getproperty, setproperty
 from z3c.form.interfaces import IAddForm
 from z3c.form.interfaces import IEditForm
 from zope import schema
@@ -54,11 +53,11 @@ class Versionable(object):
     def __init__(self, context):
         self.context = context
 
-    @getproperty
+    @property
     def changeNote(self):
         return ''
 
-    @setproperty
+    @changeNote.setter
     def changeNote(self, value):
         # store the value for later use (see events.py)
         annotation = IAnnotations(self.context.REQUEST)
diff --git a/plone/app/versioningbehavior/configure.zcml b/plone/app/versioningbehavior/configure.zcml
index eb98fa9..b9f4ad2 100644
--- a/plone/app/versioningbehavior/configure.zcml
+++ b/plone/app/versioningbehavior/configure.zcml
@@ -45,7 +45,7 @@
 
     <subscriber
         for="plone.app.versioningbehavior.behaviors.IVersioningSupport
-             zope.app.container.interfaces.IObjectAddedEvent"
+             zope.lifecycleevent.interfaces.IObjectAddedEvent"
         handler=".subscribers.create_version_on_save"
         />
 
diff --git a/plone/app/versioningbehavior/subscribers.py b/plone/app/versioningbehavior/subscribers.py
index a0cc7d8..6ec5970 100644
--- a/plone/app/versioningbehavior/subscribers.py
+++ b/plone/app/versioningbehavior/subscribers.py
@@ -5,7 +5,7 @@
 from Products.CMFEditions.interfaces.IArchivist import ArchivistUnregisteredError
 from Products.CMFEditions.interfaces.IModifier import FileTooLargeToVersionError
 from Products.CMFPlone.utils import base_hasattr
-from zope.app.container.interfaces import IContainerModifiedEvent
+from zope.container.interfaces import IContainerModifiedEvent
 
 
 def create_version_on_save(context, event):
diff --git a/setup.py b/setup.py
index 4116e46..eab31ed 100644
--- a/setup.py
+++ b/setup.py
@@ -46,9 +46,8 @@
         'plone.dexterity',
         'plone.namedfile[blobs]',
         'Products.CMFEditions>2.2.9',
-        'rwproperty',
         'setuptools',
-        'zope.app.container',
+        'zope.container',
         ],
       tests_require=tests_require,
       extras_require=dict(tests=tests_require),