updated support to django 2.0

update recaptcha to django-recaptcha2

cbreader/settings.py

@@ -38,22 +38,32 @@ INSTALLED_APPS = (
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'silk',
-    'captcha',
+    'snowpenguin.django.recaptcha2',
     'comic',
     'comic_auth',
 )
 
-MIDDLEWARE_CLASSES = (
+# MIDDLEWARE_CLASSES = (
+#     'django.contrib.sessions.middleware.SessionMiddleware',
+#     'django.middleware.common.CommonMiddleware',
+#     'django.middleware.csrf.CsrfViewMiddleware',
+#     'django.contrib.auth.middleware.AuthenticationMiddleware',
+#     'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
+#     'django.contrib.messages.middleware.MessageMiddleware',
+#     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+#     'django.middleware.security.SecurityMiddleware',
+#     'silk.middleware.SilkyMiddleware',
+# )
+MIDDLEWARE = [
+    'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'django.middleware.security.SecurityMiddleware',
     'silk.middleware.SilkyMiddleware',
-)
+]
 
 ROOT_URLCONF = 'cbreader.urls'
 
@@ -106,8 +116,11 @@ USE_TZ = True
 
 STATIC_URL = '/static/'
 
-LOGIN_REDIRECT_URL  = '/comic/'
+LOGIN_REDIRECT_URL = '/comic/'
 
 LOGIN_URL = '/login/'
 
-UNRAR_TOOL = 'C:/Program Files/WinRAR/unrar'
+UNRAR_TOOL = 'C:/Program Files/WinRAR/unrar'
+
+RECAPTCHA_PRIVATE_KEY = '6Ld50TUUAAAAAD6tQ4pR7HoBZ80EW_Mp2TyoS8Dz'
+RECAPTCHA_PUBLIC_KEY = '6Ld50TUUAAAAANJmBFM0lUVqwuFyyCdoejfpdema'

cbreader/urls.py

@@ -14,7 +14,6 @@ Including another URLconf
     2. Add a URL to urlpatterns:  url(r'^blog/', include(blog_urls))
 """
 from django.conf.urls import include, url
-from django.contrib import admin
 
 import comic.views
 import comic_auth.views
@@ -25,6 +24,6 @@ urlpatterns = [
     url(r'^logout/', comic_auth.views.comic_logout),
     url(r'^setup/', comic.views.initial_setup),
     url(r'^comic/', include('comic.urls')),
-    url(r'^admin/', include(admin.site.urls)),
+    # url(r'^admin/', include(admin.site.urls)),
     url(r'^silk/', include('silk.urls', namespace='silk'))
 ]

comic/migrations/0003_comicbook_comicpage.py

@@ -26,7 +26,7 @@ class Migration(migrations.Migration):
                 ('index', models.IntegerField()),
                 ('page_file_name', models.CharField(max_length=100)),
                 ('content_type', models.CharField(max_length=30)),
-                ('Comic', models.ForeignKey(to='comic.ComicBook')),
+                ('Comic', models.ForeignKey(to='comic.ComicBook', on_delete=models.CASCADE)),
             ],
         ),
     ]

comic/migrations/0005_auto_20150625_1400.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
 from django.conf import settings
+from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
@@ -32,11 +32,11 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='comicstatus',
             name='comic',
-            field=models.ForeignKey(to='comic.ComicBook'),
+            field=models.ForeignKey(to='comic.ComicBook', on_delete=models.CASCADE),
         ),
         migrations.AddField(
             model_name='comicstatus',
             name='user',
-            field=models.ForeignKey(to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
         ),
     ]

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>

requirements.txt

@@ -1,3 +1,4 @@
 ujson
 django
-django-simple-captcha
+django-silk
+django-recaptcha2