From cac0bae7a5ee198594e049b81248d2eda0191390 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Mon, 12 Jul 2010 13:47:53 +0000 Subject: [PATCH] revert r37751. svn path=/plone.app.discussion/trunk/; revision=37752 --- CHANGES.txt | 3 --- plone/app/discussion/browser/captcha.py | 6 +++--- plone/app/discussion/browser/comments.py | 10 +++++----- plone/app/discussion/browser/controlpanel.py | 5 ++++- plone/app/discussion/browser/validator.py | 5 +++-- plone/app/discussion/comment.py | 6 +++--- plone/app/discussion/conversation.py | 4 ++-- plone/app/discussion/tests/test_comments_viewlet.py | 6 +++--- plone/app/discussion/tests/test_conversation.py | 8 ++++---- plone/app/discussion/tests/test_notifications.py | 10 +++++----- plone/app/discussion/tool.py | 6 +++--- 11 files changed, 35 insertions(+), 34 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index b85511b..c96608d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,9 +4,6 @@ Changelog 1.0b5 (unreleased) ------------------ -* Always use zope.component getUtility instead of queryUtility. - [timo] - * Added norwegian translation. [ggozad] diff --git a/plone/app/discussion/browser/captcha.py b/plone/app/discussion/browser/captcha.py index 7f8832f..579e121 100644 --- a/plone/app/discussion/browser/captcha.py +++ b/plone/app/discussion/browser/captcha.py @@ -13,7 +13,7 @@ from zope import interface, schema from zope.annotation import factory -from zope.component import adapts, provideAdapter, getUtility +from zope.component import adapts, provideAdapter, queryUtility from zope.publisher.interfaces.browser import IDefaultBrowserLayer from zope.interface import Interface, implements @@ -54,7 +54,7 @@ class CaptchaExtender(extensible.FormExtender): self.request = request self.form = form - registry = getUtility(IRegistry) + registry = queryUtility(IRegistry) settings = registry.forInterface(IDiscussionSettings) self.captcha = settings.captcha portal_membership = getToolByName(self.context, 'portal_membership') @@ -75,4 +75,4 @@ class CaptchaExtender(extensible.FormExtender): # message to the top self.form.fields['captcha'].mode = interfaces.HIDDEN_MODE self.move('captcha', before='author_name', prefix='') - \ No newline at end of file + diff --git a/plone/app/discussion/browser/comments.py b/plone/app/discussion/browser/comments.py index 51f0649..9c89baa 100644 --- a/plone/app/discussion/browser/comments.py +++ b/plone/app/discussion/browser/comments.py @@ -11,7 +11,7 @@ from zope import interface, schema from zope.annotation import IAttributeAnnotatable -from zope.component import createObject, getMultiAdapter, getUtility +from zope.component import createObject, getMultiAdapter, queryUtility from zope.interface import Interface, implements, alsoProvides @@ -87,7 +87,7 @@ class CommentForm(extensible.ExtensibleForm, form.Form): self.widgets['author_email'].mode = interfaces.HIDDEN_MODE # XXX: Author notification code - #registry = getUtility(IRegistry) + #registry = queryUtility(IRegistry) #settings = registry.forInterface(IDiscussionSettings) #if not settings.user_notification_enabled: # self.widgets['author_notification'].mode = interfaces.HIDDEN_MODE @@ -115,7 +115,7 @@ class CommentForm(extensible.ExtensibleForm, form.Form): author_notification = None # Captcha check for anonymous users (if Captcha is enabled) - registry = getUtility(IRegistry) + registry = queryUtility(IRegistry) settings = registry.forInterface(IDiscussionSettings) portal_membership = getToolByName(self.context, 'portal_membership') if settings.captcha != 'disabled' and portal_membership.isAnonymousUser(): @@ -304,13 +304,13 @@ class CommentsViewlet(ViewletBase): def anonymous_discussion_allowed(self): # Check if anonymous comments are allowed in the registry - registry = getUtility(IRegistry) + registry = queryUtility(IRegistry) settings = registry.forInterface(IDiscussionSettings) return settings.anonymous_comments def show_commenter_image(self): # Check if showing commenter image is enabled in the registry - registry = getUtility(IRegistry) + registry = queryUtility(IRegistry) settings = registry.forInterface(IDiscussionSettings) return settings.show_commenter_image diff --git a/plone/app/discussion/browser/controlpanel.py b/plone/app/discussion/browser/controlpanel.py index 99c2b9e..328bfec 100644 --- a/plone/app/discussion/browser/controlpanel.py +++ b/plone/app/discussion/browser/controlpanel.py @@ -1,4 +1,7 @@ -# -*- coding: utf-8 -*- +from Products.Five.browser import BrowserView + +from zope.component import queryUtility +from plone.registry.interfaces import IRegistry from plone.app.registry.browser import controlpanel diff --git a/plone/app/discussion/browser/validator.py b/plone/app/discussion/browser/validator.py index 3c279a3..54c773d 100644 --- a/plone/app/discussion/browser/validator.py +++ b/plone/app/discussion/browser/validator.py @@ -8,7 +8,7 @@ from z3c.form import validator from z3c.form.interfaces import IValidator -from zope.component import getMultiAdapter, provideAdapter, getUtility +from zope.component import getMultiAdapter, provideAdapter, queryUtility from zope.schema import ValidationError @@ -54,7 +54,7 @@ class CaptchaValidator(validator.SimpleFieldValidator): data = self.request.form - registry = getUtility(IRegistry) + registry = queryUtility(IRegistry) settings = registry.forInterface(IDiscussionSettings) if settings.captcha != 'disabled': @@ -72,3 +72,4 @@ class CaptchaValidator(validator.SimpleFieldValidator): # Register Captcha validator for the Captcha field in the ICaptcha Form validator.WidgetValidatorDiscriminators(CaptchaValidator, field=ICaptcha['captcha']) + \ No newline at end of file diff --git a/plone/app/discussion/comment.py b/plone/app/discussion/comment.py index 2e87b3b..2d920ea 100644 --- a/plone/app/discussion/comment.py +++ b/plone/app/discussion/comment.py @@ -5,7 +5,7 @@ from datetime import datetime from zope.annotation.interfaces import IAnnotations, IAnnotatable from zope.component.factory import Factory -from zope.component import getUtility +from zope.component import queryUtility from zope.interface import implements @@ -165,7 +165,7 @@ def notify_user(obj, event): """ # Check if user notification is enabled - registry = getUtility(IRegistry) + registry = queryUtility(IRegistry) settings = registry.forInterface(IDiscussionSettings) if not settings.user_notification_enabled: return @@ -208,7 +208,7 @@ def notify_moderator(obj, index): """ # Check if moderator notification is enabled - registry = getUtility(IRegistry) + registry = queryUtility(IRegistry) settings = registry.forInterface(IDiscussionSettings) if not settings.moderator_notification_enabled: return diff --git a/plone/app/discussion/conversation.py b/plone/app/discussion/conversation.py index 873af48..80419ec 100644 --- a/plone/app/discussion/conversation.py +++ b/plone/app/discussion/conversation.py @@ -17,7 +17,7 @@ from persistent import Persistent from plone.registry.interfaces import IRegistry from zope.interface import implements, implementer -from zope.component import adapts, adapter, getUtility +from zope.component import adapts, adapter, queryUtility from zope.annotation.interfaces import IAnnotations, IAnnotatable @@ -98,7 +98,7 @@ class Conversation(Traversable, Persistent, Explicit): # Returns True if discussion is enabled on the conversation # Fetch discussion registry - registry = getUtility(IRegistry) + registry = queryUtility(IRegistry) settings = registry.forInterface(IDiscussionSettings) # Check if discussion is allowed globally diff --git a/plone/app/discussion/tests/test_comments_viewlet.py b/plone/app/discussion/tests/test_comments_viewlet.py index a87f720..98c5369 100644 --- a/plone/app/discussion/tests/test_comments_viewlet.py +++ b/plone/app/discussion/tests/test_comments_viewlet.py @@ -3,7 +3,7 @@ from datetime import datetime, timedelta from plone.registry import Registry -from zope.component import createObject, getUtility +from zope.component import createObject, queryUtility from Acquisition import aq_base, aq_parent, aq_inner @@ -248,7 +248,7 @@ class TestCommentsViewlet(PloneTestCase): # Anonymous discussion is not allowed by default self.failIf(self.viewlet.anonymous_discussion_allowed()) # Allow anonymous discussion - registry = getUtility(IRegistry) + registry = queryUtility(IRegistry) settings = registry.forInterface(IDiscussionSettings) registry['plone.app.discussion.interfaces.IDiscussionSettings.anonymous_comments'] = True # Test if anonymous discussion is allowed for the viewlet @@ -256,7 +256,7 @@ class TestCommentsViewlet(PloneTestCase): def test_show_commenter_image(self): self.failUnless(self.viewlet.show_commenter_image()) - registry = getUtility(IRegistry) + registry = queryUtility(IRegistry) settings = registry.forInterface(IDiscussionSettings) registry['plone.app.discussion.interfaces.IDiscussionSettings.show_commenter_image'] = False self.failIf(self.viewlet.show_commenter_image()) diff --git a/plone/app/discussion/tests/test_conversation.py b/plone/app/discussion/tests/test_conversation.py index c101e3e..df4dd72 100644 --- a/plone/app/discussion/tests/test_conversation.py +++ b/plone/app/discussion/tests/test_conversation.py @@ -1,7 +1,7 @@ import unittest from datetime import datetime, timedelta -from zope.component import createObject, getUtility +from zope.component import createObject, queryUtility from Acquisition import aq_base, aq_parent, aq_inner @@ -231,7 +231,7 @@ class ConversationTest(PloneTestCase): self.assertEquals(conversation.enabled(), True) # Disable commenting in the registry - registry = getUtility(IRegistry) + registry = queryUtility(IRegistry) settings = registry.forInterface(IDiscussionSettings) settings.globally_enabled = False @@ -259,7 +259,7 @@ class ConversationTest(PloneTestCase): self.assertEquals(conversation.enabled(), True) # Disable commenting in the registry - registry = getUtility(IRegistry) + registry = queryUtility(IRegistry) settings = registry.forInterface(IDiscussionSettings) settings.globally_enabled = False @@ -349,7 +349,7 @@ class ConversationTest(PloneTestCase): def test_is_discussion_allowed_on_content_object(self): # Allow discussion on a single content object - registry = getUtility(IRegistry) + registry = queryUtility(IRegistry) settings = registry.forInterface(IDiscussionSettings) # Create a conversation. diff --git a/plone/app/discussion/tests/test_notifications.py b/plone/app/discussion/tests/test_notifications.py index 2eb79c5..8a31730 100644 --- a/plone/app/discussion/tests/test_notifications.py +++ b/plone/app/discussion/tests/test_notifications.py @@ -9,7 +9,7 @@ from zope.app.container.interfaces import IObjectAddedEvent from zope.component import createObject from zope.component import getSiteManager -from zope.component import getUtility +from zope.component import queryUtility from Products.PloneTestCase.ptc import PloneTestCase @@ -41,7 +41,7 @@ from plone.app.discussion.tests.layer import DiscussionLayer # self.mailhost = self.portal.MailHost # # # Enable user notification setting -# registry = getUtility(IRegistry) +# registry = queryUtility(IRegistry) # settings = registry.forInterface(IDiscussionSettings) # registry['plone.app.discussion.interfaces.IDiscussionSettings.user_notification_enabled'] = True # @@ -88,7 +88,7 @@ from plone.app.discussion.tests.layer import DiscussionLayer # # def test_do_not_notify_user_when_notification_is_disabled(self): # # Disable user notification and make sure no email is send to the user. -# registry = getUtility(IRegistry) +# registry = queryUtility(IRegistry) # settings = registry.forInterface(IDiscussionSettings) # registry['plone.app.discussion.interfaces.IDiscussionSettings.user_notification_enabled'] = False # @@ -162,7 +162,7 @@ class TestModeratorNotificationUnit(PloneTestCase): ('comment_review_workflow',)) # Enable moderator notification setting - registry = getUtility(IRegistry) + registry = queryUtility(IRegistry) settings = registry.forInterface(IDiscussionSettings) registry['plone.app.discussion.interfaces.IDiscussionSettings.moderator_notification_enabled'] = True @@ -220,7 +220,7 @@ class TestModeratorNotificationUnit(PloneTestCase): def test_do_not_notify_moderator_when_notification_is_disabled(self): # Disable moderator notification setting and make sure no email is send # to the moderator. - registry = getUtility(IRegistry) + registry = queryUtility(IRegistry) settings = registry.forInterface(IDiscussionSettings) registry['plone.app.discussion.interfaces.IDiscussionSettings.moderator_notification_enabled'] = False diff --git a/plone/app/discussion/tool.py b/plone/app/discussion/tool.py index da98c7f..b4d2478 100644 --- a/plone/app/discussion/tool.py +++ b/plone/app/discussion/tool.py @@ -6,7 +6,7 @@ BBB support for the old portal_discussion is provided in the bbb package. """ from zope import interface -from zope.component import getUtility +from zope.component import queryUtility from interfaces import ICommentingTool, IComment @@ -68,13 +68,13 @@ class CommentingTool(UniqueObject, SimpleItem): def index_object(obj, event): """Index the object when added to the conversation """ - tool = getUtility(ICommentingTool) + tool = queryUtility(ICommentingTool) if tool is not None: tool.indexObject(obj) def unindex_object(obj, event): """Unindex the object when removed """ - tool = getUtility(ICommentingTool) + tool = queryUtility(ICommentingTool) if tool is not None: tool.unindexObject(obj)