Changeset 2852 in products

Timestamp:

Sep 23, 2010 4:15:54 PM (14 years ago)

Author:

mylan

Message:

#231: Fixed conflict with declaration of implemented interface for different plone versions

Location:

quintagroup.pfg.captcha/trunk/quintagroup/pfg/captcha

Files:

• config.py (modified) (1 diff)
• validator.py (modified) (2 diffs)

quintagroup.pfg.captcha/trunk/quintagroup/pfg/captcha/config.py

@@ -4 +4 @@
 
 ADD_PERMISSION = cmfcore_permissions.AddPortalContent
+
+try: 
+    # Plone 4 and higher 
+    import plone.app.upgrade 
+    PLONE_VERSION = 4 
+except ImportError: 
+    PLONE_VERSION = 3
+

quintagroup.pfg.captcha/trunk/quintagroup/pfg/captcha/validator.py

@@ -2 +2 @@
 from Products.validation import validation
 from Products.validation.interfaces.IValidator import IValidator
-from zope.interface import implements
-
 from Products.CMFPlone.utils import safe_hasattr
 
+from config import PLONE_VERSION
+
 class CaptchaValidator:
-
-    implements(IValidator)
 
     name = 'CaptchaValidator'
@@ -29 +27 @@
             return 1
 
+if PLONE_VERSION == 4:
+    from zope.interface import classImplements
+    classImplements(CaptchaValidator, IValidator)
+else:
+    CaptchaValidator.__implements__ = (IValidator,)
+
 validation.register(CaptchaValidator('isCaptchaCorrect'))