Removed __future__ imports

Also delete add_imports directive from isort configuration

conftest.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import os
 import shutil
 import warnings

docs/getting_started/tutorial.rst

@@ -67,8 +67,6 @@ Edit ``home/models.py`` as follows, to add a ``body`` field to the model:
 
 .. code-block:: python
 
-    from __future__ import unicode_literals
-
     from django.db import models
 
     from wagtail.core.models import Page

docs/topics/streamfield.rst

@@ -885,8 +885,6 @@ If you change an existing RichTextField to a StreamField, and create and run mig
 .. code-block:: python
 
     # -*- coding: utf-8 -*-
-    from __future__ import unicode_literals
-
     from django.db import models, migrations
     from wagtail.core.rich_text import RichText
 
@@ -931,8 +929,6 @@ Note that the above migration will work on published Page objects only. If you a
 .. code-block:: python
 
     # -*- coding: utf-8 -*-
-    from __future__ import unicode_literals
-
     import json
 
     from django.core.serializers.json import DjangoJSONEncoder

runtests.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import absolute_import, unicode_literals
-
 import argparse
 import os
 import shutil

scripts/get-translator-credits.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import subprocess
 import re
 from collections import defaultdict

setup.cfg

@@ -10,7 +10,6 @@ max-line-length = 120
 line_length=100
 multi_line_output=4
 skip=migrations,project_template
-add_imports=from __future__ import absolute_import,from __future__ import unicode_literals
 known_first_party=wagtail
 known_third_party=willow,modelcluster,taggit,django,unidecode,bs4,pytz,PIL
 

wagtail/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from wagtail.utils.version import get_semver_version, get_version
 
 # major.minor.patch.release.number

wagtail/admin/api/endpoints.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from collections import OrderedDict
 
 from wagtail.api.v2.endpoints import PagesAPIEndpoint

wagtail/admin/api/filters.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from rest_framework.filters import BaseFilterBackend
 
 from wagtail.api.v2.utils import BadRequestError, parse_boolean

wagtail/admin/api/serializers.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from collections import OrderedDict
 
 from rest_framework.fields import Field, ReadOnlyField

wagtail/admin/api/urls.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.conf.urls import url
 
 from wagtail.api.v2.router import WagtailAPIRouter

wagtail/admin/apps.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.apps import AppConfig
 
 from . import checks  # NOQA

wagtail/admin/blocks.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import warnings
 
 from wagtail.core.blocks import *  # noqa

wagtail/admin/checks.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import os
 
 from django.core.checks import Error, Warning, register

wagtail/admin/compare.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import difflib
 
 from bs4 import BeautifulSoup

wagtail/admin/datetimepicker.py

@@ -1,8 +1,7 @@
-from __future__ import absolute_import, unicode_literals
-
-
 # Adapted from https://djangosnippets.org/snippets/10563/
 # original author bernd-wechner
+
+
 def to_datetimepicker_format(python_format_string):
     """
     Given a python datetime format string, attempts to convert it to

wagtail/admin/decorators.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.contrib.auth.views import redirect_to_login as auth_redirect_to_login
 from django.core.exceptions import PermissionDenied
 from django.urls import reverse

wagtail/admin/edit_handlers.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import math
 import re
 

wagtail/admin/forms.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import copy
 from itertools import groupby
 

wagtail/admin/jinja2tags.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import jinja2
 from jinja2.ext import Extension
 

wagtail/admin/menu.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.forms import Media, MediaDefiningClass
 from django.forms.utils import flatatt

wagtail/admin/messages.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.contrib import messages
 from django.core.exceptions import NON_FIELD_ERRORS
 from django.template.loader import render_to_string

wagtail/admin/migrations/0001_create_admin_access_permissions.py

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

wagtail/admin/modal_workflow.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import json
 
 from django.http import HttpResponse

wagtail/admin/models.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 # The edit_handlers module extends Page with some additional attributes required by
 # wagtailadmin (namely, base_form_class and get_edit_handler). Importing this within
 # wagtailadmin.models ensures that this happens in advance of running wagtailadmin's

wagtail/admin/navigation.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from wagtail.core.models import Page
 
 

wagtail/admin/rich_text.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import json
 from collections import OrderedDict
 

wagtail/admin/search.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.forms import Media, MediaDefiningClass
 from django.forms.utils import flatatt
 from django.template.loader import render_to_string

wagtail/admin/signals.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.dispatch import Signal
 
 init_new_page = Signal(providing_args=['page', 'parent'])

wagtail/admin/site_summary.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.template.loader import render_to_string
 
 from wagtail.admin.utils import user_has_any_page_permission

wagtail/admin/templatetags/gravatar.py

@@ -7,8 +7,6 @@
 # <img src="{% gravatar_url sometemplatevariable %}">
 # just make sure to update the "default" image path below
 
-from __future__ import absolute_import, unicode_literals
-
 import hashlib
 from urllib.parse import urlencode
 

wagtail/admin/templatetags/wagtailadmin_tags.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import itertools
 
 from django import template

wagtail/admin/templatetags/wagtailuserbar.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django import template
 from django.template.loader import render_to_string
 

wagtail/admin/tests/api/test_documents.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import json
 
 from django.urls import reverse

wagtail/admin/tests/api/test_images.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import json
 
 from django.urls import reverse

wagtail/admin/tests/api/test_pages.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import collections
 import datetime
 import json

wagtail/admin/tests/api/utils.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.test import TestCase
 
 from wagtail.tests.utils import WagtailTestUtils

wagtail/admin/tests/test_account_management.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group, Permission
 from django.contrib.auth.tokens import PasswordResetTokenGenerator

wagtail/admin/tests/test_admin_search.py

@@ -1,8 +1,6 @@
 """
 Tests for the search box in the admin side menu, and the custom search hooks.
 """
-from __future__ import absolute_import, unicode_literals
-
 from django.contrib.auth.models import Permission
 from django.template import Context, Template
 from django.test import RequestFactory, TestCase

wagtail/admin/tests/test_buttons_hooks.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.test import TestCase
 from django.urls import reverse
 

wagtail/admin/tests/test_collections_views.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.test import TestCase
 from django.urls import reverse
 

wagtail/admin/tests/test_compare.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import unittest
 
 from django.test import TestCase

wagtail/admin/tests/test_edit_handlers.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from datetime import date
 
 import mock

wagtail/admin/tests/test_jinja2.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import AnonymousUser
 from django.template import engines

wagtail/admin/tests/test_messages.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.contrib import messages
 from django.test import TestCase, override_settings
 from django.urls import reverse

wagtail/admin/tests/test_navigation.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import, unicode_literals
-
 from django.contrib.auth import get_user_model
 from django.test import TestCase
 

wagtail/admin/tests/test_page_chooser.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.contrib.auth import get_user_model
 from django.test import TestCase
 from django.urls import reverse

wagtail/admin/tests/test_pages_views.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import datetime
 import logging
 import os

wagtail/admin/tests/test_password_reset.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.core import mail
 from django.test import TestCase, override_settings
 from django.urls import reverse

wagtail/admin/tests/test_privacy.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.contrib.auth.models import Group
 from django.test import TestCase
 from django.urls import reverse

wagtail/admin/tests/test_rich_text.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.conf import settings
 from django.test import TestCase
 from django.test.utils import override_settings

wagtail/admin/tests/test_userbar.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import AnonymousUser
 from django.template import Context, Template

wagtail/admin/tests/test_widgets.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.test import TestCase
 from django.test.utils import override_settings
 

wagtail/admin/tests/tests.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import, unicode_literals
-
 import json
 
 from django.contrib.auth import get_user_model

wagtail/admin/urls/collections.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.conf.urls import url
 
 from wagtail.admin.views import collection_privacy, collections

wagtail/admin/urls/pages.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.conf.urls import url
 
 from wagtail.admin.views import page_privacy, pages

wagtail/admin/urls/password_reset.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.conf.urls import url
 
 from wagtail.admin.forms import PasswordResetForm

wagtail/admin/userbar.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.template.loader import render_to_string
 
 

wagtail/admin/utils.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import logging
 from functools import wraps
 

wagtail/admin/views/account.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from functools import wraps
 
 from django.conf import settings

wagtail/admin/views/chooser.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import json
 
 from django.http import Http404

wagtail/admin/views/collection_privacy.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.core.exceptions import PermissionDenied
 from django.shortcuts import get_object_or_404
 

wagtail/admin/views/collections.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.http import HttpResponseForbidden
 from django.shortcuts import get_object_or_404, redirect
 from django.utils.translation import ugettext_lazy

wagtail/admin/views/generic.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.shortcuts import redirect
 from django.urls import reverse
 from django.utils.translation import ugettext as _

wagtail/admin/views/home.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.auth.decorators import permission_required

wagtail/admin/views/mixins.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.utils.translation import ugettext as _
 
 from wagtail.admin.forms import SearchForm

wagtail/admin/views/page_privacy.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.core.exceptions import PermissionDenied
 from django.shortcuts import get_object_or_404
 

wagtail/admin/views/pages.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from time import time
 
 from django.contrib.contenttypes.models import ContentType

wagtail/admin/views/tags.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.http import JsonResponse
 from taggit.models import Tag
 

wagtail/admin/views/userbar.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.contrib.auth.decorators import permission_required
 from django.shortcuts import render
 

wagtail/admin/viewsets/base.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 
 class ViewSet(object):
     def __init__(self, name, **kwargs):

wagtail/admin/viewsets/model.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.conf.urls import url
 from django.core.exceptions import ImproperlyConfigured
 from django.forms.models import modelform_factory

wagtail/admin/wagtail_hooks.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.contrib.auth.models import Permission
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _

wagtail/admin/widgets.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import itertools
 import json
 from functools import total_ordering

wagtail/api/conf.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 
 class APIField(object):
     def __init__(self, name, serializer=None):

wagtail/api/v2/apps.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.apps import AppConfig, apps
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured

wagtail/api/v2/endpoints.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from collections import OrderedDict
 
 from django.conf.urls import url

wagtail/api/v2/filters.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.conf import settings
 from django.db import models
 from rest_framework.filters import BaseFilterBackend

wagtail/api/v2/pagination.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from collections import OrderedDict
 
 from django.conf import settings

wagtail/api/v2/router.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import functools
 
 from django.conf.urls import include, url

wagtail/api/v2/serializers.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from collections import OrderedDict
 
 from django.urls.exceptions import NoReverseMatch

wagtail/api/v2/signal_handlers.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.db.models.signals import post_delete, post_save
 from django.urls import reverse
 

wagtail/api/v2/tests/test_documents.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import json
 
 import mock

wagtail/api/v2/tests/test_images.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import json
 
 import mock

wagtail/api/v2/tests/test_pages.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import collections
 import json
 

wagtail/api/v2/tests/tests.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from unittest import TestCase
 
 from ..utils import FieldsParameterParseError, parse_boolean, parse_fields_parameter

wagtail/api/v2/utils.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from urllib.parse import urlparse
 
 from django.conf import settings

wagtail/bin/wagtail.py

@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-from __future__ import absolute_import, print_function, unicode_literals
-
 import os
 from optparse import OptionParser
 

wagtail/contrib/forms/apps.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.apps import AppConfig
 
 

wagtail/contrib/forms/edit_handlers.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _

wagtail/contrib/forms/forms.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from collections import OrderedDict
 
 import django.forms

wagtail/contrib/forms/migrations/0001_initial.py

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

wagtail/contrib/forms/migrations/0002_add_verbose_names.py

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

wagtail/contrib/forms/migrations/0003_capitalizeverbose.py

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

wagtail/contrib/forms/models.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 import json
 import os
 

wagtail/contrib/forms/tests/test_forms.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 from django import forms
 from django.test import TestCase
 

wagtail/contrib/forms/tests/test_models.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import json
 
 from django.core import mail

wagtail/contrib/forms/tests/test_views.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 import json
 
 from django.contrib.auth import get_user_model

wagtail/contrib/forms/tests/utils.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 from wagtail.tests.testapp.models import (
     FormField, FormFieldWithCustomSubmission, FormPage, FormPageWithCustomSubmission)
 from wagtail.core.models import Page

wagtail/contrib/forms/urls.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.conf.urls import url
 
 from wagtail.contrib.forms import views