From 4ab29000a699ae0ddb6059abea529d320029745d Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Thu, 20 Jan 2011 20:38:50 +0000 Subject: [PATCH] Import Owned from OFS.owner to avoid deprecation warnings. svn path=/plone.app.discussion/trunk/; revision=46977 --- CHANGES.txt | 5 ++++- plone/app/discussion/comment.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index c7ef789..0004577 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,9 +4,12 @@ Changelog 2.0RC1 (unreleased) ------------------- +- Import Owned from OFS.owner to avoid deprecation warnings. + [timo] + - Disable discussion by default. [timo] - + - Enable ajaxify comment deletion again ([thomasdesvenain]). This has been disabled in 1.0b12 because of problems with Plone 3. [timo] diff --git a/plone/app/discussion/comment.py b/plone/app/discussion/comment.py index d66a6bb..356cc4a 100644 --- a/plone/app/discussion/comment.py +++ b/plone/app/discussion/comment.py @@ -20,7 +20,7 @@ from zope.interface import implements from Acquisition import aq_parent, aq_base, Implicit from AccessControl.Role import RoleManager -from AccessControl.Owned import Owned +from OFS.owner import Owned from persistent import Persistent