Changeset 2802 in products

Timestamp:

Sep 10, 2010 10:27:42 AM (14 years ago)

Author:

mylan

Message:

#195: fix bugs in doctests infrastructure, cleanup

Location:

quintagroup.formlib.captcha/trunk/quintagroup/formlib/captcha

Files:

• example.py (modified) (3 diffs)
• tests/tests.zcml (modified) (1 diff)

quintagroup.formlib.captcha/trunk/quintagroup/formlib/captcha/example.py

@@ -1 @@
-from zope import interface, schema
-from zope.formlib import form
-from zope.publisher.browser import TestRequest
-from zope.interface import Interface
+from zope.schema import TextLine
+from zope.component import adapts
+from zope.interface import Interface, implements
+from zope.formlib.form import EditForm, FormFields
+
 from quintagroup.formlib.captcha import Captcha
-from zope.schema import TextLine
       
 # Define CaptchaFormlibForm form schema
@@ -16 +16 @@
 
 class CaptchaFormlibFormAdapter(object):
-    adapts(interface.Interface)
-    interface.implements(ICaptchaFormlibFormSchema)
+    adapts(Interface)
+    implements(ICaptchaFormlibFormSchema)
     label = u''
     captcha = None
@@ -23 +23 @@
 # And at the last define the CaptchaFormlibForm form
 
-class CaptchaFormlibForm(form.EditForm):
-    form_fields = form.FormFields(IFoo)
+class CaptchaFormlibForm(EditForm):
+    form_fields = FormFields(ICaptchaFormlibFormSchema)

quintagroup.formlib.captcha/trunk/quintagroup/formlib/captcha/tests/tests.zcml

@@ -3 +3 @@
     xmlns:browser="http://namespaces.zope.org/browser">
 
-  <adapter factory="quintagroup.captcha.core.example.CaptchaFormlibFormAdapter" />
+  <adapter factory="quintagroup.formlib.captcha.example.CaptchaFormlibFormAdapter" />
 
   <browser:page
       name="formlib-captcha-form"
       for="*"
-      class="quintagroup.captcha.core.example.CaptchaFormlibForm"
+      class="quintagroup.formlib.captcha.example.CaptchaFormlibForm"
       permission="zope2.View"
       />