Changeset 3453 in products

Timestamp:

Apr 26, 2012 10:13:56 AM (12 years ago)

Author:

vmaksymiv

Message:

switch captcha provider adapter to named utility

Location:

quintagroup.plonecaptchas/branches/captcha_provider/quintagroup/plonecaptchas

Files:

• captcha.py (modified) (4 diffs)
• configure.zcml (modified) (1 diff)

quintagroup.plonecaptchas/branches/captcha_provider/quintagroup/plonecaptchas/captcha.py

@@ -6 +6 @@
 from quintagroup.plonecaptchas.interfaces import ICaptchaProvider
 from zope.interface import Interface
-from zope.component import adapts, getAdapters, queryAdapter
+from zope.component import adapts, getUtilitiesFor, queryUtility
 from plone.app.discussion.browser.comments import CommentForm
 
@@ -12 +12 @@
 class CaptchaProvider(object):
 
-    def __init__(self, context):
+    def __init__(self):
         self.widget_factory = CaptchaWidgetFactory
 
@@ -21 +21 @@
     def update(self):
         super(CaptchaExtender, self).update()
-        providers = getAdapters((self.context,), ICaptchaProvider)
-        if self.captcha in (n for n, a in providers) and self.isAnon:
-            captcha_provider = queryAdapter((self.context,), name=self.captcha)
+        if self.isAnon:
+            captcha_provider = queryUtility(ICaptchaProvider, name=self.captcha)
             if captcha_provider:
                 self.form.fields['captcha'].widgetFactory = \
@@ -33 +32 @@
     """ Extend captcha vocabulary with quintagroup.plonecaptchas"""
     terms = vocabularies.captcha_vocabulary(context)._terms
-    captchas = [t.value for t in terms]
+    captchas = set((t.value for t in terms))
 
-    adapters = getAdapters((context,), ICaptchaProvider)
-    for name, adapter in adapters:
+    providers = getUtilitiesFor(ICaptchaProvider)
+    for name, util in providers:
         if name and name not in captchas:
-            terms.append(SimpleTerm(value=name.lower(),
-                                    token=name.lower(),
-                                    title=name[0].upper() + name[1:]))
+            terms.append(SimpleTerm(value=name,
+                                    token=name,
+                                    title=name.capitalize()))
     return SimpleVocabulary(terms)

quintagroup.plonecaptchas/branches/captcha_provider/quintagroup/plonecaptchas/configure.zcml

@@ -27 +27 @@
     <configure zcml:condition="installed plone.app.discussion">
 
-        <adapter
+        <utility
             factory=".captcha.CaptchaProvider"
-            for="zope.component.Interface"
             provides="quintagroup.plonecaptchas.interfaces.ICaptchaProvider"
             name="plonecaptchas"