Merge pull request #34 from Lacrymology/dont-change-baseclass

a little "fix", avoid changing base class by subclassing
maccesch · Oct 14, 2012 · 95de714 · 95de714
2 parents ad69dda + 870458e
commit 95de714
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/cmsplugin_contact/cms_plugins.py b/cmsplugin_contact/cms_plugins.py
@@ -71,15 +71,17 @@ class ContactForm(self.contact_form, AkismetContactForm):
                 pass
             FormClass = ContactForm
         elif instance.get_spam_protection_method_display() == 'ReCAPTCHA':
-            RecaptchaContactForm.recaptcha_public_key = getattr(
+            #if you really want the user to be able to set the key in
-                settings, "RECAPTCHA_PUBLIC_KEY",
+            # every form, this should be more flexible
-                instance.recaptcha_public_key)
-            RecaptchaContactForm.recaptcha_private_key = getattr(
-                settings, "RECAPTCHA_PRIVATE_KEY",
-                instance.recaptcha_private_key)
-            RecaptchaContactForm.recaptcha_theme = instance.recaptcha_theme
             class ContactForm(self.contact_form, RecaptchaContactForm):
-                pass
+                recaptcha_public_key = getattr(
+                    settings, "RECAPTCHA_PUBLIC_KEY",
+                    instance.recaptcha_public_key)
+                recaptcha_private_key = getattr(
+                    settings, "RECAPTCHA_PRIVATE_KEY",
+                    instance.recaptcha_private_key)
+                recaptcha_theme = instance.recaptcha_theme
+
             FormClass = ContactForm
         else:
             class ContactForm(self.contact_form, HoneyPotContactForm):