Merge pull request stephenmcd#209 from metteludwig/master

Django 1.11 and 2.0 compatibility

Author: stephenmcd

.travis.yml

@@ -3,10 +3,16 @@ env:
   - DJANGO_VERSION=https://github.com/django/django/archive/stable/1.8.x.zip
   - DJANGO_VERSION=https://github.com/django/django/archive/stable/1.9.x.zip
   - DJANGO_VERSION=https://github.com/django/django/archive/stable/1.10.x.zip
+  - DJANGO_VERSION=https://github.com/django/django/archive/stable/1.11.x.zip
+  - DJANGO_VERSION=https://github.com/django/django/archive/stable/2.0.x.zip
 python:
   - "2.7"
   - "3.4"
   - "3.5"
+matrix:
+  exclude:
+    - python: "2.7"
+      env: DJANGO_VERSION=https://github.com/django/django/archive/stable/2.0.x.zip
 install:
   - pip install $DJANGO_VERSION
   - pip install .

forms_builder/example_project/settings.py

@@ -51,13 +51,15 @@
     },
 ]
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
 )
+# For Django 1.8 compatibility
+MIDDLEWARE_CLASSES = MIDDLEWARE
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     "django.contrib.auth.context_processors.auth",

forms_builder/example_project/urls.py

@@ -1,6 +1,10 @@
 from __future__ import unicode_literals
 
-from django.conf.urls import include, url
+try:
+    from django.urls import re_path, include
+except ImportError:
+    # For Django 1.8 compatibility
+    from django.conf.urls import url as re_path, include
 from django.contrib import admin
 from django.shortcuts import render
 
@@ -11,8 +15,8 @@
 admin.autodiscover()
 
 urlpatterns = [
-    url(r'^admin/', include(admin.site.urls)),
-    url(r'^forms/', include(form_urls)),
-    url(r'^$', lambda request: render(request, "index.html",
+    re_path(r'^admin/', admin.site.urls),
+    re_path(r'^forms/', include(form_urls)),
+    re_path(r'^$', lambda request: render(request, "index.html",
                                       {"forms": Form.objects.all()})),
 ]

forms_builder/forms/admin.py

@@ -7,10 +7,14 @@
 from datetime import datetime
 from io import BytesIO, StringIO
 
-from django.conf.urls import url
 from django.contrib import admin
 from django.core.files.storage import FileSystemStorage
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse, re_path
+except ImportError:
+    # For django 1.8 compatiblity
+    from django.conf.urls import url as re_path
+    from django.core.urlresolvers import reverse
 from django.db.models import Count
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render, get_object_or_404
@@ -84,16 +88,16 @@ def get_urls(self):
         """
         urls = super(FormAdmin, self).get_urls()
         extra_urls = [
-            url("^(?P<form_id>\d+)/entries/$",
+            re_path("^(?P<form_id>\d+)/entries/$",
                 self.admin_site.admin_view(self.entries_view),
                 name="form_entries"),
-            url("^(?P<form_id>\d+)/entries/show/$",
+            re_path("^(?P<form_id>\d+)/entries/show/$",
                 self.admin_site.admin_view(self.entries_view),
                 {"show": True}, name="form_entries_show"),
-            url("^(?P<form_id>\d+)/entries/export/$",
+            re_path("^(?P<form_id>\d+)/entries/export/$",
                 self.admin_site.admin_view(self.entries_view),
                 {"export": True}, name="form_entries_export"),
-            url("^file/(?P<field_entry_id>\d+)/$",
+            re_path("^file/(?P<field_entry_id>\d+)/$",
                 self.admin_site.admin_view(self.file_view),
                 name="form_file"),
         ]

forms_builder/forms/fields.py

@@ -2,7 +2,11 @@
 
 from django.core.exceptions import ImproperlyConfigured
 from django import forms
-from django.forms.extras import SelectDateWidget
+try:
+    from django.forms import SelectDateWidget
+except ImportError:
+    # For Django 1.8 compatibility
+    from django.forms.extras import SelectDateWidget
 from django.utils.translation import ugettext_lazy as _
 
 from forms_builder.forms.settings import USE_HTML5, EXTRA_FIELDS, EXTRA_WIDGETS

forms_builder/forms/forms.py

@@ -7,9 +7,17 @@
 
 import django
 from django import forms
-from django.forms.extras import SelectDateWidget
+try:
+    from django.forms import SelectDateWidget
+except ImportError:
+    # For Django 1.8 compatibility
+    from django.forms.extras import SelectDateWidget
 from django.core.files.storage import default_storage
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    # For Django 1.8 compatibility
+    from django.core.urlresolvers import reverse
 from django.template import Template
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _

forms_builder/forms/migrations/0001_initial.py

@@ -83,7 +83,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('entry_time', models.DateTimeField(verbose_name='Date/time')),
-                ('form', models.ForeignKey(related_name='entries', to='forms.Form')),
+                ('form', models.ForeignKey(related_name='entries', to='forms.Form', on_delete=models.CASCADE)),
             ],
             options={
                 'abstract': False,
@@ -95,13 +95,13 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='fieldentry',
             name='entry',
-            field=models.ForeignKey(related_name='fields', to='forms.FormEntry'),
+            field=models.ForeignKey(related_name='fields', to='forms.FormEntry', on_delete=models.CASCADE),
             preserve_default=True,
         ),
         migrations.AddField(
             model_name='field',
             name='form',
-            field=models.ForeignKey(related_name='fields', to='forms.Form'),
+            field=models.ForeignKey(related_name='fields', to='forms.Form', on_delete=models.CASCADE),
             preserve_default=True,
         ),
     ]

forms_builder/forms/models.py

@@ -1,8 +1,15 @@
 from __future__ import unicode_literals
 
+from django import VERSION as DJANGO_VERSION
 from django.contrib.sites.models import Site
 from django.core.exceptions import ValidationError
-from django.core.urlresolvers import reverse
+
+try:
+    from django.urls import reverse
+except ImportError:
+    # For Django 1.8 compatibility
+    from django.core.urlresolvers import reverse
+
 from django.db import models
 from django.db.models import Q
 from django.utils.encoding import python_2_unicode_compatible
@@ -117,7 +124,10 @@ def published(self, for_user=None):
         status = self.status == STATUS_PUBLISHED
         publish_date = self.publish_date is None or self.publish_date <= now()
         expiry_date = self.expiry_date is None or self.expiry_date >= now()
-        authenticated = for_user is not None and for_user.is_authenticated()
+        authenticated = for_user is not None and for_user.is_authenticated
+        if DJANGO_VERSION <= (1, 9):
+            # Django 1.8 compatibility, is_authenticated has to be called as a method.
+            authenticated = for_user is not None and for_user.is_authenticated()
         login_required = (not self.login_required or authenticated)
         return status and publish_date and expiry_date and login_required
 
@@ -255,11 +265,11 @@ class Meta:
 ###################################################
 
 class FormEntry(AbstractFormEntry):
-    form = models.ForeignKey("Form", related_name="entries")
+    form = models.ForeignKey("Form", related_name="entries", on_delete=models.CASCADE)
 
 
 class FieldEntry(AbstractFieldEntry):
-    entry = models.ForeignKey("FormEntry", related_name="fields")
+    entry = models.ForeignKey("FormEntry", related_name="fields", on_delete=models.CASCADE)
 
 
 class Form(AbstractForm):
@@ -271,7 +281,7 @@ class Field(AbstractField):
     Implements automated field ordering.
     """
 
-    form = models.ForeignKey("Form", related_name="fields")
+    form = models.ForeignKey("Form", related_name="fields", on_delete=models.CASCADE)
     order = models.IntegerField(_("Order"), null=True, blank=True)
 
     class Meta(AbstractField.Meta):

forms_builder/forms/urls.py

@@ -1,11 +1,14 @@
 from __future__ import unicode_literals
-
-from django.conf.urls import url
+try:
+    from django.urls import re_path
+except ImportError:
+    # For Django 1.8 compatibility
+    from django.conf.urls import url as re_path
 
 from forms_builder.forms import views
 
 
 urlpatterns = [
-    url(r"(?P<slug>.*)/sent/$", views.form_sent, name="form_sent"),
-    url(r"(?P<slug>.*)/$", views.form_detail, name="form_detail"),
+    re_path(r"(?P<slug>.*)/sent/$", views.form_sent, name="form_sent"),
+    re_path(r"(?P<slug>.*)/$", views.form_detail, name="form_detail"),
 ]

forms_builder/forms/views.py

@@ -4,7 +4,11 @@
 
 from django.conf import settings
 from django.contrib.auth import REDIRECT_FIELD_NAME
-from django.core.urlresolvers import reverse
+try:
+    from django.urls import reverse
+except ImportError:
+    # For Django 1.8 compatibility
+    from django.core.urlresolvers import reverse
 from django.http import HttpResponse, HttpResponseBadRequest
 from django.shortcuts import get_object_or_404, redirect, render_to_response
 from django.template import RequestContext

setup.py

@@ -50,7 +50,7 @@
             "sphinx-me >= 0.1.2",
             "unidecode",
             "django-email-extras >= 0.2",
-            "django >= 1.8, < 1.11",
+            "django >= 1.8",
             "future <= 0.15.0",
         ],
         classifiers = [