drop python 2 support and make compatible with django 3

CHANGELOG.rst

@@ -3,6 +3,19 @@ Changelog
 =========
 
 
+6.2.0.rc1 (2020-10-05)
+==================
+
+* Scroll the page to the submitted form success text (before the page would just reload without a success message)
+* Fix the email notification variables render (it wasn't working for a year)
+* Fix `reply_to_email` field - it wasn't possible to configure before
+* Fix the form submission success message that was appearing on a non-related to the form page
+* Fix a bug that would break the form when the user added spaces to a field's name
+* Fix the caching bug that was breaking the page when a field was added outside of a form plugin
+* Drop Python 2 support, make compatible with Django 3
+* Drop the form plugin that doesn't allow to send email notifications
+
+
 5.0.4 (2020-05-19)
 ==================
 

aldryn_config.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from aldryn_client import forms
 
 

aldryn_forms/__init__.py

@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
-__version__ = '5.0.4'
+__version__ = '6.2.0.rc1'

aldryn_forms/action_backends.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import logging
 
 from django.utils.translation import ugettext_lazy as _

aldryn_forms/action_backends_base.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import abc
 
 import six

aldryn_forms/admin/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.contrib import admin
 
 from ..models import FormSubmission

aldryn_forms/admin/base.py

@@ -1,17 +1,12 @@
-# -*- coding: utf-8 -*-
 from email.utils import formataddr
 
 from django.contrib import admin
 from django.template.loader import render_to_string
 from django.urls import reverse
-from django.utils import six
 from django.utils.translation import ugettext_lazy as _
 
 
-if six.PY2:
-    str_dunder_method = '__unicode__'
-else:
-    str_dunder_method = '__str__'
+str_dunder_method = '__str__'
 
 
 class BaseFormSubmissionAdmin(admin.ModelAdmin):

aldryn_forms/admin/exporter.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from tablib import Dataset
 
 

aldryn_forms/admin/forms.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from datetime import datetime, timedelta
 
 from django import forms

aldryn_forms/admin/views.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django import get_version
 from django.contrib import messages
 from django.http import HttpResponse

aldryn_forms/cms_apps.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.utils.translation import ugettext_lazy as _
 
 from cms.app_base import CMSApp

aldryn_forms/cms_plugins.py

@@ -5,13 +5,10 @@
 from cms.plugin_base import CMSPluginBase
 from cms.plugin_pool import plugin_pool
 from django import forms
-from django.contrib import messages
 from django.contrib.admin import TabularInline
 from django.core.validators import MinLengthValidator
 from django.db.models import query
 from django.template.loader import select_template
-from django.utils.safestring import mark_safe
-from django.utils.six import text_type
 from django.utils.translation import ugettext
 from django.utils.translation import ugettext_lazy as _
 from emailit.api import send_mail
@@ -289,10 +286,10 @@ class Field(FormElement):
 
     def serialize_value(self, instance, value, is_confirmation=False):
         if isinstance(value, query.QuerySet):
-            value = u', '.join(map(text_type, value))
+            value = u', '.join(map(str, value))
         elif value is None:
             value = '-'
-        return text_type(value)
+        return str(value)
 
     def serialize_field(self, form, field, is_confirmation=False):
         """Returns a (key, label, value) named tuple for the given field."""

aldryn_forms/compat.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 try:
     from collections import OrderedDict
 except ImportError:

aldryn_forms/contrib/email_notifications/cms_plugins.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import logging
 from email.utils import parseaddr
 from typing import List

aldryn_forms/contrib/email_notifications/helpers.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import os
 from string import Template
 

aldryn_forms/contrib/email_notifications/migrations/0001_initial.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 from django.conf import settings

aldryn_forms/contrib/email_notifications/migrations/0002_form_plugin_add_missing_permission.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 from django.contrib.auth.models import Permission

aldryn_forms/contrib/email_notifications/migrations/0003_auto_20180206_1733.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.10.8 on 2018-02-06 19:33
 from __future__ import unicode_literals
 

aldryn_forms/contrib/email_notifications/models.py

@@ -1,11 +1,9 @@
-# -*- coding: utf-8 -*-
 from email.utils import formataddr
 from functools import partial
 
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext
 from django.utils.translation import ugettext_lazy as _
 
@@ -52,7 +50,6 @@ def get_notification_text_context_keys_as_choices(self):
         return choices
 
 
-@python_2_unicode_compatible
 class EmailNotification(models.Model):
 
     class Meta:

aldryn_forms/contrib/email_notifications/notification.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.utils.translation import ugettext
 
 from .helpers import get_email_template_name

aldryn_forms/forms.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django import forms
 from django.conf import settings
 from django.forms.forms import NON_FIELD_ERRORS

aldryn_forms/helpers.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 def get_user_name(user):
     try:
         name = user.get_full_name()

aldryn_forms/migrations/0001_initial.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 from django.conf import settings

aldryn_forms/migrations/0002_auto_20151014_1631.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 import django.core.validators

aldryn_forms/migrations/0003_auto_20151207_1038.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 import django.core.validators

aldryn_forms/migrations/0004_auto_20151207_1825.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 from django.conf import settings

aldryn_forms/migrations/0005_auto_20160821_1026.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.9.8 on 2016-08-21 14:26
 from __future__ import unicode_literals
 

aldryn_forms/migrations/0006_auto_20160821_1039.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.9.8 on 2016-08-21 14:39
 from __future__ import unicode_literals
 

aldryn_forms/migrations/0007_auto_20170315_1421.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 from django.db import migrations, models

aldryn_forms/migrations/0008_auto_20170316_0845.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 from django.db import migrations, models

aldryn_forms/migrations/0009_auto_20171218_1049.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.10.8 on 2017-12-18 12:49
 from __future__ import unicode_literals
 

aldryn_forms/migrations/0010_auto_20171220_1733.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.10.8 on 2017-12-20 19:33
 from __future__ import unicode_literals
 

aldryn_forms/migrations/0011_auto_20180110_1300.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.10.8 on 2018-01-10 15:00
 from __future__ import unicode_literals
 

aldryn_forms/models.py

@@ -12,9 +12,7 @@
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.db.models.functions import Coalesce
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.functional import cached_property
-from django.utils.six import text_type
 from django.utils.translation import ugettext_lazy as _
 from djangocms_attributes_field.fields import AttributesField
 from filer.fields.folder import FilerFolderField
@@ -92,7 +90,6 @@ def field_type(self):
         return self.name.rpartition('_')[0]
 
 
-@python_2_unicode_compatible
 class BaseFormPlugin(CMSPlugin):
     FALLBACK_FORM_TEMPLATE = 'aldryn_forms/form.html'
     DEFAULT_FORM_TEMPLATE = getattr(
@@ -335,7 +332,6 @@ def get_form_elements(self):
         return self._form_elements
 
 
-@python_2_unicode_compatible
 class FormPlugin(BaseFormPlugin):
 
     class Meta:
@@ -345,7 +341,6 @@ def __str__(self):
         return self.name
 
 
-@python_2_unicode_compatible
 class FieldsetPlugin(CMSPlugin):
 
     legend = models.CharField(_('Legend'), max_length=255, blank=True)
@@ -356,10 +351,9 @@ class FieldsetPlugin(CMSPlugin):
     )
 
     def __str__(self):
-        return self.legend or text_type(self.pk)
+        return self.legend or str(self.pk)
 
 
-@python_2_unicode_compatible
 class FieldPluginBase(CMSPlugin):
     name = models.CharField(
         _('Name'),
@@ -520,7 +514,6 @@ class ImageUploadFieldPlugin(FileFieldPluginBase):
     )
 
 
-@python_2_unicode_compatible
 class Option(models.Model):
     field = models.ForeignKey(FieldPlugin, editable=False, on_delete=models.CASCADE)
     value = models.CharField(_('Value'), max_length=255)
@@ -546,7 +539,6 @@ def save(self, *args, **kwargs):
         return super(Option, self).save(*args, **kwargs)
 
 
-@python_2_unicode_compatible
 class FormButtonPlugin(CMSPlugin):
     label = models.CharField(_('Label'), max_length=255)
     custom_classes = models.CharField(
@@ -559,7 +551,6 @@ def __str__(self):
         return self.label
 
 
-@python_2_unicode_compatible
 class FormSubmission(models.Model):
     name = models.CharField(
         max_length=255,

aldryn_forms/signals.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.dispatch import Signal
 
 

aldryn_forms/sizefield/utils.py

@@ -1,11 +1,9 @@
-from __future__ import unicode_literals
-
 import operator
 import re
 import sys
 
 from django.conf import settings
-from django.utils import formats, six
+from django.utils import formats
 from django.utils.translation import ugettext as _
 
 
@@ -43,7 +41,7 @@ def filesizeformat(bytes, decimals=1):
     def filesize_number_format(value):
         return formats.number_format(round(value, decimals), decimals)
 
-    units_list = sorted(six.iteritems(FILESIZE_UNITS), key=operator.itemgetter(1))
+    units_list = sorted(FILESIZE_UNITS.items(), key=operator.itemgetter(1))
 
     value = unit = None
     len_unints_list = len(units_list)
@@ -65,7 +63,7 @@ def parse_size(size):
     """
     @rtype int
     """
-    if isinstance(size, six.integer_types):
+    if isinstance(size, int):
         return size
 
     r = file_size_re.match(size.strip())

aldryn_forms/templatetags/aldryn_forms_tags.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django import template
 from django.utils import encoding
 from django.utils.safestring import mark_safe

aldryn_forms/urls.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.conf.urls import url
 
 from .views import submit_form_view

aldryn_forms/utils.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 from django.conf import settings

aldryn_forms/validators.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from email.utils import parseaddr
 
 from django.core.exceptions import ValidationError

aldryn_forms/views.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.http import HttpResponseBadRequest, HttpResponseRedirect
 from django.shortcuts import render
 from django.urls import resolve

setup.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from setuptools import find_packages, setup
 
 from aldryn_forms import __version__

tests/settings.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 from __future__ import division, print_function, unicode_literals
 
 

tests/test_migrations.py

@@ -1,10 +1,7 @@
-# -*- coding: utf-8 -*-
-# original from
-# http://tech.octopus.energy/news/2016/01/21/testing-for-missing-migrations-in-django.html
+from StringIO import StringIO
+
 from django.core.management import call_command
 from django.test import TestCase, override_settings
-from django.utils.six import text_type
-from django.utils.six.moves import StringIO
 
 
 class MigrationTestCase(TestCase):
@@ -22,7 +19,7 @@ def test_for_missing_migrations(self):
         try:
             call_command('makemigrations', **options)
         except SystemExit as e:
-            status_code = text_type(e)
+            status_code = str(e)
         else:
             # the "no changes" exit code is 0
             status_code = '0'