Drop Python 2.7 support

Author: Sylvain Delabye

CHANGELOG.rst

@@ -5,6 +5,7 @@ ChangeLog
 master (unreleased)
 ===================
 
+- Drop support for Python 2.7 (EOL: January 1st, 2020)
 - Removed ``tox.ini`` directive that skipped missing Python interpreters.
 
 Release 3.3.0 (2019-11-29)

demo/demo/builder/urls.py

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

demo/demo/builder/views.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.views.generic.list import ListView
 from django.views.generic.detail import DetailView
 from django.views.generic.edit import UpdateView
@@ -13,7 +12,7 @@ class FormidableListView(ListView):
     model = Formidable
 
     def get_context_data(self):
-        context = super(FormidableListView, self).get_context_data()
+        context = super().get_context_data()
         context['roles'] = get_accesses()
         return context
 
@@ -24,7 +23,7 @@ class FormidableDetailView(DetailView):
 
     def dispatch(self, request, *args, **kwargs):
         request.session['role'] = kwargs['role']
-        return super(FormidableDetailView, self).dispatch(
+        return super().dispatch(
             request, *args, **kwargs
         )
 

demo/demo/extra_field_toolbox.py

@@ -28,7 +28,7 @@ class Meta(FieldSerializer.Meta):
         fields = BASE_FIELDS + ('parameters',)
 
     def to_internal_value(self, data):
-        data = super(ColorPickerFieldSerializer, self).to_internal_value(data)
+        data = super().to_internal_value(data)
         # Check if the parameters are compliant
         format = data.get('color_format')
         if format is None:
@@ -54,7 +54,7 @@ def to_python(self, value):
         return value
 
     def validate(self, value):
-        super(ColorPickerField, self).validate(value)
+        super().validate(value)
         params = getattr(self, '__formidable_field_parameters', {})
         color_format = params.get('color_format')
         if color_format == 'rgb':

demo/demo/formidable_accesses.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 from formidable.accesses import AccessObject, PreviewMode
 
 

demo/demo/views.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django.views.generic.edit import FormView
 
 from formidable.models import Formidable

demo/tests/serializers/test_validations.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 from django.test import TestCase
 
 from formidable.models import Formidable

demo/tests/test_conditions.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 import os
 import json
 import copy
@@ -36,7 +32,7 @@ def setUpTestData(cls):
         ))
 
     def setUp(self):
-        super(ConditionTestCase, self).setUp()
+        super().setUp()
         conditions_schema = [
             {
                 'name': 'My Name',
@@ -286,7 +282,7 @@ def get_form_class(self, formidable, role):
         return get_dynamic_form_class(formidable, role)
 
     def setUp(self):
-        super(DropdownConditionsTestCase, self).setUp()
+        super().setUp()
         conditions_schema = [
             {
                 'name': 'Show a and b if value "ab" selected',
@@ -372,7 +368,7 @@ def get_form_class(self, formidable, role):
         return get_dynamic_form_class(formidable, role)
 
     def setUp(self):
-        super(MultipleConditionsTestCase, self).setUp()
+        super().setUp()
         conditions_schema = [
             {
                 'name': 'display A',

demo/tests/test_custom_views.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.test import TestCase
 
 from rest_framework.permissions import BasePermission, AllowAny

demo/tests/test_end_point.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 import copy
 from functools import reduce
 from unittest import skipIf
@@ -1311,7 +1307,7 @@ class UpdateFormTestCase(TestCase):
     }]
 
     def setUp(self):
-        super(UpdateFormTestCase, self).setUp()
+        super().setUp()
         self.form = Formidable.objects.create(
             label='testform', description='test form',
         )

demo/tests/test_exception_handler.py

@@ -1,9 +1,3 @@
-# -*- coding: utf-8 -*-
-"""
-Tests for the exception handling module, common with every view in Formidable.
-"""
-from __future__ import unicode_literals
-
 from django.urls import reverse
 from django.core.exceptions import PermissionDenied
 from django import forms
@@ -14,19 +8,15 @@
 
 from formidable.models import Formidable
 
-import six
-if six.PY3:
-    from unittest.mock import patch
-else:
-    from mock import patch
+from unittest.mock import patch
 
 
 INIT_TO_MOCK = 'formidable.serializers.forms.FormidableSerializer.__init__'
 
 
 class ExceptionHandlingTest(APITestCase):
     def setUp(self):
-        super(ExceptionHandlingTest, self).setUp()
+        super().setUp()
         self.form = Formidable.objects.create(
             label='test', description='test'
         )

demo/tests/test_extra_field_filler.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import json
 from os.path import join, dirname
 
@@ -73,7 +70,7 @@ def test_field_factory_settings_not_field_builder(self):
 class FillFormWithExtraFieldTestCase(TestCase):
 
     def setUp(self):
-        super(FillFormWithExtraFieldTestCase, self).setUp()
+        super().setUp()
         self.custom_type_id = 'color_picker'
         self.field_register = FieldSerializerRegister.get_instance()
 
@@ -87,7 +84,7 @@ class ColorPickerFieldSerializer(BaseColorPickerFieldSerializer):
             self.schema_data = json.load(fd)
 
     def tearDown(self):
-        super(FillFormWithExtraFieldTestCase, self).tearDown()
+        super().tearDown()
         self.field_register.pop(self.custom_type_id)
 
     @override_settings(FORMIDABLE_EXTERNAL_FIELD_BUILDERS={

demo/tests/test_field_parameters.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.test import TestCase
 
 from formidable.forms import FormidableForm
@@ -18,15 +17,15 @@ class WithParametrizedField(FormidableForm):
 class TestToFormidableParametrizedField(TestCase):
 
     def setUp(self):
-        super(TestToFormidableParametrizedField, self).setUp()
+        super().setUp()
         self.field_register = FieldSerializerRegister.get_instance()
 
         @load_serializer(self.field_register)
         class ColorPickerFieldSerializer(BaseColorPickerFieldSerializer):
             pass
 
     def tearDown(self):
-        super(TestToFormidableParametrizedField, self).tearDown()
+        super().tearDown()
         self.field_register.pop(BaseColorPickerFieldSerializer.type_id)
 
     def test_to_formidable(self):

demo/tests/test_fields.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 from django.test import TestCase
 
 from formidable.forms import BaseDynamicForm, fields
@@ -16,7 +12,7 @@ class MockForm(BaseDynamicForm):
         sepa = fields.SeparatorField()
 
     def setUp(self):
-        super(RenderingFormatField, self).setUp()
+        super().setUp()
         self.form = self.MockForm()
 
     def test_render_help_text(self):

demo/tests/test_form_from_schema.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.test import TestCase
 from django import forms
 from freezegun import freeze_time

demo/tests/test_forms.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 import json
 import os
 

demo/tests/test_from_form.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 from django.test import TestCase
 
 from formidable.models import Formidable
@@ -506,7 +502,7 @@ class CreationForm(FormidableForm):
 class TestEditForm(TestCase):
 
     def setUp(self):
-        super(TestEditForm, self).setUp()
+        super().setUp()
         self.formidable = CreationForm.to_formidable(
             label='create', description='my creation form'
         )

demo/tests/test_integration.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 import os
 import json
 
@@ -22,12 +18,7 @@
 
 from . import form_data, form_data_items
 
-import six
-
-if six.PY3:
-    from unittest.mock import patch
-else:
-    from mock import patch
+from unittest.mock import patch
 
 
 TESTS_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -155,7 +146,7 @@ def test_with_unknown_accesses(self):
 class UpdateFormTestCase(FormidableAPITestCase):
 
     def setUp(self):
-        super(UpdateFormTestCase, self).setUp()
+        super().setUp()
         self.form = Formidable.objects.create(
             label='test', description='test'
         )
@@ -387,7 +378,7 @@ def test_get(self):
 class TestChain(FormidableAPITestCase):
 
     def setUp(self):
-        super(FormidableAPITestCase, self).setUp()
+        super().setUp()
         self.form = MyTestForm.to_formidable(label='Jedi Form')
         self.assertTrue(self.form.pk)
 
@@ -429,7 +420,7 @@ class TestValidationEndPoint(FormidableAPITestCase):
     url = 'formidable:form_validation'
 
     def setUp(self):
-        super(TestValidationEndPoint, self).setUp()
+        super().setUp()
         self.formidable = MyForm.to_formidable(label='title')
 
     def test_validate_data_ok(self):

demo/tests/test_models.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 from django.test import TestCase
 
 from formidable import constants
@@ -25,7 +21,7 @@ class FormTest(FormidableForm):
 
 class FieldItemTestCase(TestCase):
     def setUp(self):
-        super(FieldItemTestCase, self).setUp()
+        super().setUp()
         self.formidable = FormTest.to_formidable(label='label')
 
     def test_label_field_size(self):
@@ -51,7 +47,7 @@ def test_value_field_size(self):
 class UnicodeTestCase(TestCase):
 
     def setUp(self):
-        super(UnicodeTestCase, self).setUp()
+        super().setUp()
         self.formidable = FormTest.to_formidable(label='label')
 
     def test_formidable(self):

demo/tests/test_perfs_rec.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import os
 import json
 
@@ -30,7 +29,7 @@ def record_performance(self, record_name, path=None):
         if 'postgresql' in settings.DATABASES['default']['ENGINE']:
             record_name = '{}-pg'.format(record_name)
 
-        return super(TestCase, self).record_performance(
+        return super().record_performance(
             path=path,
             record_name=record_name
         )
@@ -45,7 +44,7 @@ class TestPerfRec(TestCase):
 
     @classmethod
     def setUpClass(cls):
-        super(TestPerfRec, cls).setUpClass()
+        super().setUpClass()
         fixtures_path = os.path.join(cls.dir_path, cls.fixtures_folder)
 
         cls.form_data = json.load(

demo/tests/test_permissions.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.conf import settings
 from django.test import TestCase, override_settings
 from rest_framework.permissions import AllowAny, IsAuthenticated

demo/tests/test_post_save_callbacks.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from copy import deepcopy
 from django.core.exceptions import ImproperlyConfigured
 from django.urls import reverse
@@ -14,11 +11,7 @@
 
 from . import form_data, form_data_items
 
-import six
-if six.PY3:
-    from unittest.mock import patch
-else:
-    from mock import patch
+from unittest.mock import patch
 
 CALLBACK = 'demo.callback_save'
 CALLBACK_EXCEPTION = 'demo.callback_exception'
@@ -99,7 +92,7 @@ def test_create_callback_is_non_existent(self):
 class UpdateFormTestCase(APITestCase):
 
     def setUp(self):
-        super(UpdateFormTestCase, self).setUp()
+        super().setUp()
         self.form = Formidable.objects.create(
             label='test', description='test'
         )