updated support to django 2.0

update recaptcha to django-recaptcha2

comic_auth/forms.py

@@ -1,5 +1,6 @@
-from captcha.fields import CaptchaField
 from django import forms
+from snowpenguin.django.recaptcha2.fields import ReCaptchaField
+from snowpenguin.django.recaptcha2.widgets import ReCaptchaWidget
 
 from comic.models import Setting
 
@@ -31,16 +32,11 @@ class LoginForm(forms.Form):
         if created:
             setting.value = '0'
         if setting.value == '1':
-            public_key = Setting.objects.get(name='RECAPTCHA_PUBLIC_KEY').value
-            private_key = Setting.objects.get(name='RECAPTCHA_PRIVATE_KEY').value
-
-            captcha = CaptchaField(
-                label='',
-                public_key=public_key,
-                private_key=private_key,
-                attrs={
-                    'theme': 'white',
-                    'class': 'form-control',
-                }
-            )
-            self.fields['captcha'] = captcha
+            # public_key = Setting.objects.get(name='RECAPTCHA_PUBLIC_KEY').value
+            # private_key = Setting.objects.get(name='RECAPTCHA_PRIVATE_KEY').value
+            #
+            # captcha = ReCaptchaField(
+            #     public_key=public_key,
+            #     private_key=private_key,
+            # )
+            self.fields['captcha'] = ReCaptchaField(widget=ReCaptchaWidget())

comic_auth/templates/comic_auth/login.html

@@ -1,7 +1,8 @@
 {% extends "base.html" %}
+{% load recaptcha2 %}
 {% block title %}CBWebReader - Login{% endblock %}
 {% block content %}
-
+    {% recaptcha_init %}
 <div class="col-md-4 col-md-offset-4">
     {% if error %}
         <div class="alert alert-danger" role="alert"><p>Your username and password didn't match. Please try again.</p></div>