ajung/plone.app.discussion
ajung/plone.app.discussion
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix deprecation warning

Browse Source 
svn path=/plone.app.discussion/trunk/; revision=48234
This commit is contained in:
David Glick 2011-03-26 02:44:49 +00:00
parent 9b87f2b246
commit ebbf2d9b7b
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.txt
View File

@ -4,6 +4,9 @@ Changelog
2.0b1 (Unreleased) 2.0b1 (Unreleased)
------------------ ------------------
- Fixed RoleManager import to avoid deprecation warning on Zope 2.13.
[davisagli]
- French translations. - French translations.
[thomasdesvenain] [thomasdesvenain]
@ -15,6 +18,7 @@ Changelog
2.0a3 (2011-03-02) 2.0a3 (2011-03-02)
------------------ ------------------
- Fixed test failure for the default user portrait, which changed from - Fixed test failure for the default user portrait, which changed from
defaultUser.gif to defaultUser.png in Products.PlonePAS 4.0.5 defaultUser.gif to defaultUser.png in Products.PlonePAS 4.0.5
[maurits] [maurits]

7
plone/app/discussion/comment.py
View File

@ -19,7 +19,6 @@ from zope.interface import implements
from Acquisition import aq_parent, aq_base, Implicit from Acquisition import aq_parent, aq_base, Implicit
from AccessControl.Role import RoleManager
from OFS.owner import Owned from OFS.owner import Owned
from persistent import Persistent from persistent import Persistent
@ -41,6 +40,12 @@ from plone.app.discussion.interfaces import IDiscussionSettings
from Products.CMFCore.CMFCatalogAware import CatalogAware from Products.CMFCore.CMFCatalogAware import CatalogAware
from Products.CMFCore.CMFCatalogAware import WorkflowAware from Products.CMFCore.CMFCatalogAware import WorkflowAware
try:
from OFS.role import RoleManager
except ImportError:
# Zope <=2.12
from AccessControl.Role import RoleManager
COMMENT_TITLE = _(u"comment_title", COMMENT_TITLE = _(u"comment_title",
default=u"${creator} on ${content}") default=u"${creator} on ${content}")