Changeset 2210 in products

Timestamp:

Apr 27, 2010 12:02:35 PM (13 years ago)

Author:

mylan

Message:

Merged all changes from branches/captchas-refactoring into trunk.

Merged revisions 3004,3006,3094,3096-3099,3119-3120 via svnmerge from
​http://svn.quintagroup.com/products/quintagroup.formlib.captcha/branches/captchas-refactoring

........

r3004 | liebster | 2010-03-22 16:16:05 +0200 (Mon, 22 Mar 2010) | 1 line

Remove egg info

........

r3006 | liebster | 2010-03-22 16:20:03 +0200 (Mon, 22 Mar 2010) | 1 line

Add depending quintagroup.captcha.core

........

r3094 | mylan | 2010-04-01 16:53:05 +0300 (Thu, 01 Apr 2010) | 1 line

#173: Fix wrong import, update package description, add zope.formlib as dependency

........

r3096 | mylan | 2010-04-01 17:39:30 +0300 (Thu, 01 Apr 2010) | 1 line

#173: update dependencies list in quintagroup.formlib.captcha package, commented for now

........

r3097 | mylan | 2010-04-01 18:48:49 +0300 (Thu, 01 Apr 2010) | 1 line

#173: Move quintagroup.formlib.captcha.form content into the quintagroup.formlib.captcha, add zope.app.form as direct requirement

........

r3098 | mylan | 2010-04-02 13:38:30 +0300 (Fri, 02 Apr 2010) | 1 line

#186: Remove needless namespace declarations in configure.zcml

........

r3099 | mylan | 2010-04-02 13:40:52 +0300 (Fri, 02 Apr 2010) | 1 line

#186: added tests for field and widget staff registration, for captcha widget operation

........

r3119 | mylan | 2010-04-08 16:42:00 +0300 (Thu, 08 Apr 2010) | 1 line

#186: Add dependency package include in configure.zcml

........

r3120 | mylan | 2010-04-08 16:42:34 +0300 (Thu, 08 Apr 2010) | 1 line

#186: Fixed registration tests

........

Location:

quintagroup.formlib.captcha/trunk

Files:

• . (modified) (2 props)
• quintagroup/formlib/captcha/__init__.py (modified) (1 diff)
• quintagroup/formlib/captcha/captcha.txt (copied) (copied from quintagroup.formlib.captcha/branches/captchas-refactoring/quintagroup/formlib/captcha/captcha.txt)
• quintagroup/formlib/captcha/configure.zcml (modified) (1 diff)
• quintagroup/formlib/captcha/field.py (copied) (copied from quintagroup.formlib.captcha/branches/captchas-refactoring/quintagroup/formlib/captcha/field.py)
• quintagroup/formlib/captcha/form (deleted)
• quintagroup/formlib/captcha/interfaces.py (copied) (copied from quintagroup.formlib.captcha/branches/captchas-refactoring/quintagroup/formlib/captcha/interfaces.py)
• quintagroup/formlib/captcha/tests.py (copied) (copied from quintagroup.formlib.captcha/branches/captchas-refactoring/quintagroup/formlib/captcha/tests.py)
• quintagroup/formlib/captcha/widget.py (copied) (copied from quintagroup.formlib.captcha/branches/captchas-refactoring/quintagroup/formlib/captcha/widget.py)
• setup.py (modified) (2 diffs)

quintagroup.formlib.captcha/trunk/quintagroup/formlib/captcha/__init__.py

@@ -1 @@
-#
+from widget import CaptchaWidget
+from field import Captcha

quintagroup.formlib.captcha/trunk/quintagroup/formlib/captcha/configure.zcml

@@ -1 +1 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
-    xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="quintagroup.formlib.captcha">
 
-    <include package=".form"
-             zcml:condition="installed zope.app.form"/>
+  <include package="quintagroup.captcha.core" />
+  <include package="zope.formlib" />
 
+  <view
+      type="zope.publisher.interfaces.browser.IBrowserRequest"
+      for=".interfaces.ICaptcha"
+      provides="zope.app.form.interfaces.IInputWidget"
+      factory=".widget.CaptchaWidget"
+      permission="zope.Public"
+      />
 
 </configure>

quintagroup.formlib.captcha/trunk/setup.py

@@ -6 +6 @@
 setup(name='quintagroup.formlib.captcha',
       version=version,
-      description="Captcha field for formlib based on qPloneCaptchas Zope2 Product",
+      description="Captcha field for formlib based on quintagroup.captcha.core package",
       long_description=open("README.txt").read() + "\n" +
                        open(os.path.join("docs", "HISTORY.txt")).read(),
@@ -27 +27 @@
           'setuptools',
           # -*- Extra requirements: -*-
+          'quintagroup.captcha.core',
+          'zope.app.form',
+          # 'zope.component',
+          # 'zope.interface',
+          # 'zope.schema',
+          # 'zope.i18n',
+          # 'Products.CMFCore',
       ],
       entry_points="""