X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/9bee23ed8d6c06f5f000f8951d8cb37953d214d1..2aaa3bb66ded22169469986ff14115a3387284b2:/forum_modules/localauth/forms.py?ds=sidebyside diff --git a/forum_modules/localauth/forms.py b/forum_modules/localauth/forms.py index 6facc5d..ee61577 100644 --- a/forum_modules/localauth/forms.py +++ b/forum_modules/localauth/forms.py @@ -7,8 +7,6 @@ from django.contrib.auth import authenticate from django import forms import logging -from forum.settings import RECAPTCHA_PUB_KEY, RECAPTCHA_PRIV_KEY - class ClassicRegisterForm(SetPasswordForm): """ legacy registration form """ @@ -19,7 +17,14 @@ class ClassicRegisterForm(SetPasswordForm): def __init__(self, *args, **kwargs): super(ClassicRegisterForm, self).__init__(*args, **kwargs) - if len(str(RECAPTCHA_PUB_KEY.value)) > 0 and len(str(RECAPTCHA_PRIV_KEY.value)) > 0: + # Try importing the ReCapthca public and private keys, Import Error will be raised in case it has been disabled + try: + from forum.settings import RECAPTCHA_PUB_KEY, RECAPTCHA_PRIV_KEY + recaptcha_enabled = len(str(RECAPTCHA_PUB_KEY.value)) > 0 and len(str(RECAPTCHA_PRIV_KEY.value)) > 0 + except ImportError: + recaptcha_enabled = False + + if recaptcha_enabled: spam_fields = call_all_handlers('create_anti_spam_field') if spam_fields: spam_fields = dict(spam_fields)