Remove python 2 exceptions

tests/test_wagtailformblocks.py

@@ -4,8 +4,6 @@
 
 Tests for `wagtailformblocks` module.
 """
-from __future__ import unicode_literals
-
 import json
 
 import pytest

wagtailformblocks/blocks.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django import forms
 from django.urls import reverse
 
@@ -44,7 +42,8 @@ def get_context(self, value, parent_context=None):
         if not parent_context:
             context = super(WagtailFormBlock, self).get_context(value)
         else:
-            context = super(WagtailFormBlock, self).get_context(value, parent_context)
+            context = super(WagtailFormBlock, self).get_context(
+                value, parent_context)
 
         form = value['form']
 

wagtailformblocks/forms.py

@@ -1,5 +1,4 @@
 from captcha.fields import ReCaptchaField
-from django.conf import settings
 from wagtail.contrib.forms.forms import FormBuilder as OrigFormBuilder
 
 from wagtailformblocks.utils.conf import (

wagtailformblocks/migrations/0001_initial.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10 on 2016-08-23 09:55
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 import modelcluster.fields

wagtailformblocks/migrations/0002_baseform_add_recaptcha.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.2 on 2016-10-28 12:21
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

wagtailformblocks/models.py

@@ -1,11 +1,7 @@
-from __future__ import absolute_import, unicode_literals
-
 import json
 
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db import models
-from django.utils import six
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 from model_utils.managers import InheritanceManager
 from modelcluster.fields import ParentalKey
@@ -19,7 +15,6 @@
 from .utils.conf import recaptcha_enabled
 
 
-@python_2_unicode_compatible
 class FormSubmission(models.Model):
     """Data for a Form submission."""
 
@@ -42,7 +37,6 @@ class FormField(AbstractFormField):
     form = ParentalKey('BaseForm', related_name='form_fields')
 
 
-@python_2_unicode_compatible
 class BaseForm(ClusterableModel):
     name = models.CharField(max_length=255)
     store_submission = models.BooleanField(
@@ -92,6 +86,7 @@ def process_form_submission(self, form):
 if recaptcha_enabled():
     BaseForm.panels.insert(2, FieldPanel('add_recaptcha'))
 
+
 class EmailForm(BaseForm):
     """
     A Form Page that sends email. Pages implementing a form to be send
@@ -134,7 +129,7 @@ def send_form_mail(self, form):
             if name == 'recaptcha' or not data:
                 continue
             content.append(
-                field.label + ': ' + six.text_type(data))
+                field.label + ': ' + str(data))
 
         send_mail(
             self.subject, '\n'.join(content), addresses, self.from_address)

wagtailformblocks/urls.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.conf.urls import url
 
 from .views import FormProcessView

wagtailformblocks/utils/conf.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 

wagtailformblocks/views.py

@@ -1,7 +1,4 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.http import JsonResponse
-from django.utils import six
 from django.views.generic import View
 
 from .models import BaseForm
@@ -17,7 +14,7 @@ def post(self, request, pk):
             formdef = BaseForm.objects.get_subclass(id=pk)
         except BaseForm.DoesNotExist:
             err = {
-                'message': six.text_type(get_formblocks_setting('ERROR_MSG')), # NOQA
+                'message': str(get_formblocks_setting('ERROR_MSG')), # NOQA
                 'detail': 'Could not find WagtailForm with id {}'.format(pk)
             }
             return JsonResponse(err, status=400)
@@ -28,13 +25,13 @@ def post(self, request, pk):
             formdef.process_form_submission(form)
         else:
             err = {
-                'message': six.text_type(get_formblocks_setting('ERROR_MSG')),  # NOQA
+                'message': str(get_formblocks_setting('ERROR_MSG')),  # NOQA
                 'detail': form.errors
             }
             return JsonResponse(err, status=400)
 
         resp = {
-            'message': formdef.success_message or six.text_type(
+            'message': formdef.success_message or str(
                 get_formblocks_setting('SUCCESS_MSG')
             )
         }

wagtailformblocks/wagtail_hooks.py

@@ -41,6 +41,7 @@ class SubmissionAdmin(ModelAdmin):
     list_display = ('form_data', 'form', 'submit_time')
     list_filter = ('form', )
 
+
 form_admins.append(SubmissionAdmin)