Changeset 2215 in products

Timestamp:

Apr 27, 2010 12:57:38 PM (14 years ago)

Author:

mylan

Message:

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

Merged revisions 3005,3095,3110-3117 via svnmerge from
​http://svn.quintagroup.com/products/quintagroup.z3cform.captcha/branches/captchas-refactoring

........

r3005 | liebster | 2010-03-22 16:19:33 +0200 (Mon, 22 Mar 2010) | 1 line

Add depending quintagroup.captcha.core

........

r3095 | mylan | 2010-04-01 17:31:59 +0300 (Thu, 01 Apr 2010) | 1 line

#173: Fix wrong import, update package description, update dependencies list in quintagroup.z3cform.captcha package

........

r3110 | mylan | 2010-04-07 16:56:33 +0300 (Wed, 07 Apr 2010) | 1 line

#185: Add default captcha widget factory adapter registration

........

r3111 | mylan | 2010-04-07 16:59:19 +0300 (Wed, 07 Apr 2010) | 1 line

#185: force package autoregistration with z3c.autoinclude

........

r3112 | mylan | 2010-04-07 17:00:00 +0300 (Wed, 07 Apr 2010) | 1 line

#185: Add default imports into package init module

........

r3113 | mylan | 2010-04-07 17:03:13 +0300 (Wed, 07 Apr 2010) | 1 line

#185: Add tests infrastructure

........

r3114 | mylan | 2010-04-07 17:04:51 +0300 (Wed, 07 Apr 2010) | 1 line

#185: Add registration tests

........

r3115 | mylan | 2010-04-07 18:07:15 +0300 (Wed, 07 Apr 2010) | 1 line

#185: Add tests for captcha widget

........

r3116 | mylan | 2010-04-07 18:38:19 +0300 (Wed, 07 Apr 2010) | 1 line

#185: Add tests for captcha validator

........

r3117 | mylan | 2010-04-08 16:23:01 +0300 (Thu, 08 Apr 2010) | 1 line

#185: Fixed tests for plone>=3.3

........

Location:

quintagroup.z3cform.captcha/trunk

Files:

• . (modified) (2 props)
• quintagroup/z3cform/captcha/__init__.py (modified) (1 diff)
• quintagroup/z3cform/captcha/configure.zcml (modified) (1 diff)
• quintagroup/z3cform/captcha/meta.zcml (copied) (copied from quintagroup.z3cform.captcha/branches/captchas-refactoring/quintagroup/z3cform/captcha/meta.zcml)
• quintagroup/z3cform/captcha/tests.py (copied) (copied from quintagroup.z3cform.captcha/branches/captchas-refactoring/quintagroup/z3cform/captcha/tests.py)
• quintagroup/z3cform/captcha/validator.py (modified) (1 diff)
• setup.py (modified) (2 diffs)

quintagroup.z3cform.captcha/trunk/quintagroup/z3cform/captcha/__init__.py

@@ +1 @@
+from field import Captcha
+from widget import CaptchaWidget
+from widget import CaptchaWidgetFactory

quintagroup.z3cform.captcha/trunk/quintagroup/z3cform/captcha/configure.zcml

@@ -2 +2 @@
     xmlns="http://namespaces.zope.org/zope"
     i18n_domain="quintagroup.z3cform.captcha">
+
+  <include package="z3c.form" />
+  <include package="quintagroup.captcha.core" />
+
+  <!--Widget-->
+  <adapter
+    for=".field.Captcha
+         z3c.form.interfaces.IFormLayer"
+    factory=".widget.CaptchaWidgetFactory"
+    />
 
   <!--Validators-->

quintagroup.z3cform.captcha/trunk/quintagroup/z3cform/captcha/validator.py

@@ -7 +7 @@
 from Products.CMFCore.utils import getToolByName
 
-from quintagroup.plonecaptchas.utils import decrypt, parseKey, encrypt1, getWord
+from quintagroup.captcha.core.utils import decrypt, parseKey, encrypt1, getWord
 
 from z3c.form.validator import SimpleFieldValidator

quintagroup.z3cform.captcha/trunk/setup.py

@@ -6 +6 @@
 setup(name='quintagroup.z3cform.captcha',
       version=version,
-      description="Captcha field for z3cform based on quintagroup.plonecaptchas package",
+      description="Captcha field for z3cform based on quintagroup.captcha.core package",
       long_description=open("README.txt").read() + "\n" +
                        open(os.path.join("docs", "HISTORY.txt")).read(),
@@ -26 +26 @@
       install_requires=[
           'setuptools',
-          # uncomment next packages only if they will be downloaded from some package index
-          # 'quintagroup.plonecaptchas', 
+          'quintagroup.captcha.core',
+          'z3c.form',
+          # 'zope.schema',
+          # 'zope.i18n',
+          # 'zope.component',
+          # 'zope.interface',
+          # 'zope.app.pagetemplate',
+          # 'Products.CMFCore',
       ],
       entry_points="""
       # -*- Entry points: -*-
+      [z3c.autoinclude.plugin]
+      target = plone
       """,
       )
+
+