diff --git a/conftest.py b/conftest.py index 6e75b4b2a..e90893309 100644 --- a/conftest.py +++ b/conftest.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import os import shutil import warnings diff --git a/docs/getting_started/tutorial.rst b/docs/getting_started/tutorial.rst index 2624e91b6..a383bd482 100644 --- a/docs/getting_started/tutorial.rst +++ b/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 diff --git a/docs/topics/streamfield.rst b/docs/topics/streamfield.rst index 58e7c6c9b..935d75329 100644 --- a/docs/topics/streamfield.rst +++ b/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 diff --git a/runtests.py b/runtests.py index 285030fa3..473f33962 100755 --- a/runtests.py +++ b/runtests.py @@ -1,7 +1,5 @@ #!/usr/bin/env python -from __future__ import absolute_import, unicode_literals - import argparse import os import shutil diff --git a/scripts/get-translator-credits.py b/scripts/get-translator-credits.py index 951021a70..e2213b1de 100644 --- a/scripts/get-translator-credits.py +++ b/scripts/get-translator-credits.py @@ -1,4 +1,3 @@ -from __future__ import print_function import subprocess import re from collections import defaultdict diff --git a/setup.cfg b/setup.cfg index 64ade7efb..d6615dc9f 100644 --- a/setup.cfg +++ b/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 diff --git a/wagtail/__init__.py b/wagtail/__init__.py index 9bf627290..972d376f9 100644 --- a/wagtail/__init__.py +++ b/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 diff --git a/wagtail/admin/api/endpoints.py b/wagtail/admin/api/endpoints.py index e26db0ce2..ded382c29 100644 --- a/wagtail/admin/api/endpoints.py +++ b/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 diff --git a/wagtail/admin/api/filters.py b/wagtail/admin/api/filters.py index 395739a76..3d45f1d26 100644 --- a/wagtail/admin/api/filters.py +++ b/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 diff --git a/wagtail/admin/api/serializers.py b/wagtail/admin/api/serializers.py index aa23df62f..40e43cd0c 100644 --- a/wagtail/admin/api/serializers.py +++ b/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 diff --git a/wagtail/admin/api/urls.py b/wagtail/admin/api/urls.py index 0b830f79b..672608d56 100644 --- a/wagtail/admin/api/urls.py +++ b/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 diff --git a/wagtail/admin/apps.py b/wagtail/admin/apps.py index d4ed82eac..7f1f928ce 100644 --- a/wagtail/admin/apps.py +++ b/wagtail/admin/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import AppConfig from . import checks # NOQA diff --git a/wagtail/admin/blocks.py b/wagtail/admin/blocks.py index e063b32b0..d2c4a7ed7 100644 --- a/wagtail/admin/blocks.py +++ b/wagtail/admin/blocks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import warnings from wagtail.core.blocks import * # noqa diff --git a/wagtail/admin/checks.py b/wagtail/admin/checks.py index bfdc64c6c..74b22c1dc 100644 --- a/wagtail/admin/checks.py +++ b/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 diff --git a/wagtail/admin/compare.py b/wagtail/admin/compare.py index 7062641b8..6028e50b9 100644 --- a/wagtail/admin/compare.py +++ b/wagtail/admin/compare.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import difflib from bs4 import BeautifulSoup diff --git a/wagtail/admin/datetimepicker.py b/wagtail/admin/datetimepicker.py index d0ed17f78..1581f68d5 100644 --- a/wagtail/admin/datetimepicker.py +++ b/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 diff --git a/wagtail/admin/decorators.py b/wagtail/admin/decorators.py index 0053a96a5..64397fa6f 100644 --- a/wagtail/admin/decorators.py +++ b/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 diff --git a/wagtail/admin/edit_handlers.py b/wagtail/admin/edit_handlers.py index ca7a8f72e..fc660083d 100644 --- a/wagtail/admin/edit_handlers.py +++ b/wagtail/admin/edit_handlers.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import math import re diff --git a/wagtail/admin/forms.py b/wagtail/admin/forms.py index 1b06832e4..8e28d2931 100644 --- a/wagtail/admin/forms.py +++ b/wagtail/admin/forms.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import copy from itertools import groupby diff --git a/wagtail/admin/jinja2tags.py b/wagtail/admin/jinja2tags.py index dc3c4ecf4..1f7e0d761 100644 --- a/wagtail/admin/jinja2tags.py +++ b/wagtail/admin/jinja2tags.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import jinja2 from jinja2.ext import Extension diff --git a/wagtail/admin/menu.py b/wagtail/admin/menu.py index 229fce1b9..2da43fc93 100644 --- a/wagtail/admin/menu.py +++ b/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 diff --git a/wagtail/admin/messages.py b/wagtail/admin/messages.py index b136c185b..e803c3d3f 100644 --- a/wagtail/admin/messages.py +++ b/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 diff --git a/wagtail/admin/migrations/0001_create_admin_access_permissions.py b/wagtail/admin/migrations/0001_create_admin_access_permissions.py index 8f19f74d6..5e79ddae0 100644 --- a/wagtail/admin/migrations/0001_create_admin_access_permissions.py +++ b/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 diff --git a/wagtail/admin/modal_workflow.py b/wagtail/admin/modal_workflow.py index 6ff696360..ac46d5d12 100644 --- a/wagtail/admin/modal_workflow.py +++ b/wagtail/admin/modal_workflow.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import json from django.http import HttpResponse diff --git a/wagtail/admin/models.py b/wagtail/admin/models.py index 18a2a42a5..4908bb47f 100644 --- a/wagtail/admin/models.py +++ b/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 diff --git a/wagtail/admin/navigation.py b/wagtail/admin/navigation.py index 400ee87d8..d5769af98 100644 --- a/wagtail/admin/navigation.py +++ b/wagtail/admin/navigation.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from wagtail.core.models import Page diff --git a/wagtail/admin/rich_text.py b/wagtail/admin/rich_text.py index 553904f04..549184c3b 100644 --- a/wagtail/admin/rich_text.py +++ b/wagtail/admin/rich_text.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import json from collections import OrderedDict diff --git a/wagtail/admin/search.py b/wagtail/admin/search.py index 9fb41be79..1f66d97fa 100644 --- a/wagtail/admin/search.py +++ b/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 diff --git a/wagtail/admin/signals.py b/wagtail/admin/signals.py index 2fb73b160..e2c8bc199 100644 --- a/wagtail/admin/signals.py +++ b/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']) diff --git a/wagtail/admin/site_summary.py b/wagtail/admin/site_summary.py index 418d8850a..fc168a546 100644 --- a/wagtail/admin/site_summary.py +++ b/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 diff --git a/wagtail/admin/templatetags/gravatar.py b/wagtail/admin/templatetags/gravatar.py index 356b3b196..a5c3a4f05 100644 --- a/wagtail/admin/templatetags/gravatar.py +++ b/wagtail/admin/templatetags/gravatar.py @@ -7,8 +7,6 @@ # # just make sure to update the "default" image path below -from __future__ import absolute_import, unicode_literals - import hashlib from urllib.parse import urlencode diff --git a/wagtail/admin/templatetags/wagtailadmin_tags.py b/wagtail/admin/templatetags/wagtailadmin_tags.py index cf8855841..a1c9049b9 100644 --- a/wagtail/admin/templatetags/wagtailadmin_tags.py +++ b/wagtail/admin/templatetags/wagtailadmin_tags.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import itertools from django import template diff --git a/wagtail/admin/templatetags/wagtailuserbar.py b/wagtail/admin/templatetags/wagtailuserbar.py index bdae49445..6c89b7216 100644 --- a/wagtail/admin/templatetags/wagtailuserbar.py +++ b/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 diff --git a/wagtail/admin/tests/api/test_documents.py b/wagtail/admin/tests/api/test_documents.py index 725e55a5f..aa9d42cfa 100644 --- a/wagtail/admin/tests/api/test_documents.py +++ b/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 diff --git a/wagtail/admin/tests/api/test_images.py b/wagtail/admin/tests/api/test_images.py index 8d7c10b68..befee8b24 100644 --- a/wagtail/admin/tests/api/test_images.py +++ b/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 diff --git a/wagtail/admin/tests/api/test_pages.py b/wagtail/admin/tests/api/test_pages.py index 80122ea93..174045445 100644 --- a/wagtail/admin/tests/api/test_pages.py +++ b/wagtail/admin/tests/api/test_pages.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import collections import datetime import json diff --git a/wagtail/admin/tests/api/utils.py b/wagtail/admin/tests/api/utils.py index bc092906e..4709e261c 100644 --- a/wagtail/admin/tests/api/utils.py +++ b/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 diff --git a/wagtail/admin/tests/test_account_management.py b/wagtail/admin/tests/test_account_management.py index a7301a62e..fd0057898 100644 --- a/wagtail/admin/tests/test_account_management.py +++ b/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 diff --git a/wagtail/admin/tests/test_admin_search.py b/wagtail/admin/tests/test_admin_search.py index dc4fb8d66..70790813f 100644 --- a/wagtail/admin/tests/test_admin_search.py +++ b/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 diff --git a/wagtail/admin/tests/test_buttons_hooks.py b/wagtail/admin/tests/test_buttons_hooks.py index b30a7ffa4..5535cda1e 100644 --- a/wagtail/admin/tests/test_buttons_hooks.py +++ b/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 diff --git a/wagtail/admin/tests/test_collections_views.py b/wagtail/admin/tests/test_collections_views.py index a055fc7d7..c039e64cb 100644 --- a/wagtail/admin/tests/test_collections_views.py +++ b/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 diff --git a/wagtail/admin/tests/test_compare.py b/wagtail/admin/tests/test_compare.py index 3013b2421..91526d1f3 100644 --- a/wagtail/admin/tests/test_compare.py +++ b/wagtail/admin/tests/test_compare.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import unittest from django.test import TestCase diff --git a/wagtail/admin/tests/test_edit_handlers.py b/wagtail/admin/tests/test_edit_handlers.py index f4a33c082..8185a6604 100644 --- a/wagtail/admin/tests/test_edit_handlers.py +++ b/wagtail/admin/tests/test_edit_handlers.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from datetime import date import mock diff --git a/wagtail/admin/tests/test_jinja2.py b/wagtail/admin/tests/test_jinja2.py index 11e71d063..951e0c6d8 100644 --- a/wagtail/admin/tests/test_jinja2.py +++ b/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 diff --git a/wagtail/admin/tests/test_messages.py b/wagtail/admin/tests/test_messages.py index 5a0df8283..bf1003b29 100644 --- a/wagtail/admin/tests/test_messages.py +++ b/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 diff --git a/wagtail/admin/tests/test_navigation.py b/wagtail/admin/tests/test_navigation.py index a9289b108..22c522e72 100644 --- a/wagtail/admin/tests/test_navigation.py +++ b/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 diff --git a/wagtail/admin/tests/test_page_chooser.py b/wagtail/admin/tests/test_page_chooser.py index 0fbf7f8e3..306738d9f 100644 --- a/wagtail/admin/tests/test_page_chooser.py +++ b/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 diff --git a/wagtail/admin/tests/test_pages_views.py b/wagtail/admin/tests/test_pages_views.py index 8b562bb41..21232bdca 100644 --- a/wagtail/admin/tests/test_pages_views.py +++ b/wagtail/admin/tests/test_pages_views.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import datetime import logging import os diff --git a/wagtail/admin/tests/test_password_reset.py b/wagtail/admin/tests/test_password_reset.py index 3b9ed59cd..7dc752f5f 100644 --- a/wagtail/admin/tests/test_password_reset.py +++ b/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 diff --git a/wagtail/admin/tests/test_privacy.py b/wagtail/admin/tests/test_privacy.py index eeeb5ef6b..8a6f93e9e 100644 --- a/wagtail/admin/tests/test_privacy.py +++ b/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 diff --git a/wagtail/admin/tests/test_rich_text.py b/wagtail/admin/tests/test_rich_text.py index e4b1439b1..9fb756e4b 100644 --- a/wagtail/admin/tests/test_rich_text.py +++ b/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 diff --git a/wagtail/admin/tests/test_userbar.py b/wagtail/admin/tests/test_userbar.py index 28cbc9a09..3c6fb7222 100644 --- a/wagtail/admin/tests/test_userbar.py +++ b/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 diff --git a/wagtail/admin/tests/test_widgets.py b/wagtail/admin/tests/test_widgets.py index 0e5b9e76c..c4607c404 100644 --- a/wagtail/admin/tests/test_widgets.py +++ b/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 diff --git a/wagtail/admin/tests/tests.py b/wagtail/admin/tests/tests.py index 0f4eb69f9..d1897b107 100644 --- a/wagtail/admin/tests/tests.py +++ b/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 diff --git a/wagtail/admin/urls/collections.py b/wagtail/admin/urls/collections.py index fee10588d..f05478db0 100644 --- a/wagtail/admin/urls/collections.py +++ b/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 diff --git a/wagtail/admin/urls/pages.py b/wagtail/admin/urls/pages.py index 5af9a2d6a..61ceb59de 100644 --- a/wagtail/admin/urls/pages.py +++ b/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 diff --git a/wagtail/admin/urls/password_reset.py b/wagtail/admin/urls/password_reset.py index c33ab8181..f039f7a68 100644 --- a/wagtail/admin/urls/password_reset.py +++ b/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 diff --git a/wagtail/admin/userbar.py b/wagtail/admin/userbar.py index 7a1fb9415..a841a14de 100644 --- a/wagtail/admin/userbar.py +++ b/wagtail/admin/userbar.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.template.loader import render_to_string diff --git a/wagtail/admin/utils.py b/wagtail/admin/utils.py index 9d6d9ff1f..9709062ba 100644 --- a/wagtail/admin/utils.py +++ b/wagtail/admin/utils.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, unicode_literals - import logging from functools import wraps diff --git a/wagtail/admin/views/account.py b/wagtail/admin/views/account.py index 17649ce4a..caddccbbd 100644 --- a/wagtail/admin/views/account.py +++ b/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 diff --git a/wagtail/admin/views/chooser.py b/wagtail/admin/views/chooser.py index 9c3b90321..e78bb7b63 100644 --- a/wagtail/admin/views/chooser.py +++ b/wagtail/admin/views/chooser.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import json from django.http import Http404 diff --git a/wagtail/admin/views/collection_privacy.py b/wagtail/admin/views/collection_privacy.py index 03be10a79..9c29efe3b 100644 --- a/wagtail/admin/views/collection_privacy.py +++ b/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 diff --git a/wagtail/admin/views/collections.py b/wagtail/admin/views/collections.py index 543a44068..0179024ff 100644 --- a/wagtail/admin/views/collections.py +++ b/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 diff --git a/wagtail/admin/views/generic.py b/wagtail/admin/views/generic.py index f6ae82eec..4276fdbfa 100644 --- a/wagtail/admin/views/generic.py +++ b/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 _ diff --git a/wagtail/admin/views/home.py b/wagtail/admin/views/home.py index 5700eaa82..7293c5582 100644 --- a/wagtail/admin/views/home.py +++ b/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 diff --git a/wagtail/admin/views/mixins.py b/wagtail/admin/views/mixins.py index 644a88792..b28afb146 100644 --- a/wagtail/admin/views/mixins.py +++ b/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 diff --git a/wagtail/admin/views/page_privacy.py b/wagtail/admin/views/page_privacy.py index ecfe21620..bc50f8880 100644 --- a/wagtail/admin/views/page_privacy.py +++ b/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 diff --git a/wagtail/admin/views/pages.py b/wagtail/admin/views/pages.py index 0137dd64c..29a106146 100644 --- a/wagtail/admin/views/pages.py +++ b/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 diff --git a/wagtail/admin/views/tags.py b/wagtail/admin/views/tags.py index d06480dc9..6662fcd9b 100644 --- a/wagtail/admin/views/tags.py +++ b/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 diff --git a/wagtail/admin/views/userbar.py b/wagtail/admin/views/userbar.py index 27ca4e5d5..82151b6ac 100644 --- a/wagtail/admin/views/userbar.py +++ b/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 diff --git a/wagtail/admin/viewsets/base.py b/wagtail/admin/viewsets/base.py index 4a51988ba..9068d37aa 100644 --- a/wagtail/admin/viewsets/base.py +++ b/wagtail/admin/viewsets/base.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - class ViewSet(object): def __init__(self, name, **kwargs): diff --git a/wagtail/admin/viewsets/model.py b/wagtail/admin/viewsets/model.py index 5e00901e4..c51b6e0f0 100644 --- a/wagtail/admin/viewsets/model.py +++ b/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 diff --git a/wagtail/admin/wagtail_hooks.py b/wagtail/admin/wagtail_hooks.py index c3d3667a1..ca58de473 100644 --- a/wagtail/admin/wagtail_hooks.py +++ b/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 _ diff --git a/wagtail/admin/widgets.py b/wagtail/admin/widgets.py index 714b66f00..cfd169442 100644 --- a/wagtail/admin/widgets.py +++ b/wagtail/admin/widgets.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import itertools import json from functools import total_ordering diff --git a/wagtail/api/conf.py b/wagtail/api/conf.py index 65a9169c5..8aaf7f7e4 100644 --- a/wagtail/api/conf.py +++ b/wagtail/api/conf.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - class APIField(object): def __init__(self, name, serializer=None): diff --git a/wagtail/api/v2/apps.py b/wagtail/api/v2/apps.py index af8c25cff..a065df263 100644 --- a/wagtail/api/v2/apps.py +++ b/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 diff --git a/wagtail/api/v2/endpoints.py b/wagtail/api/v2/endpoints.py index 57f246859..4d115c85b 100644 --- a/wagtail/api/v2/endpoints.py +++ b/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 diff --git a/wagtail/api/v2/filters.py b/wagtail/api/v2/filters.py index 54b838e39..f90df6995 100644 --- a/wagtail/api/v2/filters.py +++ b/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 diff --git a/wagtail/api/v2/pagination.py b/wagtail/api/v2/pagination.py index 4e27d8a87..cc2baa892 100644 --- a/wagtail/api/v2/pagination.py +++ b/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 diff --git a/wagtail/api/v2/router.py b/wagtail/api/v2/router.py index ac93c2c4b..de9b882bb 100644 --- a/wagtail/api/v2/router.py +++ b/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 diff --git a/wagtail/api/v2/serializers.py b/wagtail/api/v2/serializers.py index 85436a96f..b082c5053 100644 --- a/wagtail/api/v2/serializers.py +++ b/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 diff --git a/wagtail/api/v2/signal_handlers.py b/wagtail/api/v2/signal_handlers.py index 819351ea1..0f3fe4acc 100644 --- a/wagtail/api/v2/signal_handlers.py +++ b/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 diff --git a/wagtail/api/v2/tests/test_documents.py b/wagtail/api/v2/tests/test_documents.py index 564ef1bfb..368878cad 100644 --- a/wagtail/api/v2/tests/test_documents.py +++ b/wagtail/api/v2/tests/test_documents.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import json import mock diff --git a/wagtail/api/v2/tests/test_images.py b/wagtail/api/v2/tests/test_images.py index 1482230fe..5d3911e29 100644 --- a/wagtail/api/v2/tests/test_images.py +++ b/wagtail/api/v2/tests/test_images.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import json import mock diff --git a/wagtail/api/v2/tests/test_pages.py b/wagtail/api/v2/tests/test_pages.py index dcf393bac..724b14dcb 100644 --- a/wagtail/api/v2/tests/test_pages.py +++ b/wagtail/api/v2/tests/test_pages.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import collections import json diff --git a/wagtail/api/v2/tests/tests.py b/wagtail/api/v2/tests/tests.py index 7f61f0a2e..5d97576bf 100644 --- a/wagtail/api/v2/tests/tests.py +++ b/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 diff --git a/wagtail/api/v2/utils.py b/wagtail/api/v2/utils.py index b66e148e8..ba0c48b6e 100644 --- a/wagtail/api/v2/utils.py +++ b/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 diff --git a/wagtail/bin/wagtail.py b/wagtail/bin/wagtail.py index 4f21ee897..6b1dae54f 100644 --- a/wagtail/bin/wagtail.py +++ b/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 diff --git a/wagtail/contrib/forms/apps.py b/wagtail/contrib/forms/apps.py index b7a77c680..259e7c0b4 100644 --- a/wagtail/contrib/forms/apps.py +++ b/wagtail/contrib/forms/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import AppConfig diff --git a/wagtail/contrib/forms/edit_handlers.py b/wagtail/contrib/forms/edit_handlers.py index ab8c7118e..76dded726 100644 --- a/wagtail/contrib/forms/edit_handlers.py +++ b/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 _ diff --git a/wagtail/contrib/forms/forms.py b/wagtail/contrib/forms/forms.py index f83bc447b..34887628c 100644 --- a/wagtail/contrib/forms/forms.py +++ b/wagtail/contrib/forms/forms.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from collections import OrderedDict import django.forms diff --git a/wagtail/contrib/forms/migrations/0001_initial.py b/wagtail/contrib/forms/migrations/0001_initial.py index 5ca4f8796..99a4e7c25 100644 --- a/wagtail/contrib/forms/migrations/0001_initial.py +++ b/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 diff --git a/wagtail/contrib/forms/migrations/0002_add_verbose_names.py b/wagtail/contrib/forms/migrations/0002_add_verbose_names.py index 43daef12f..cd6be956e 100644 --- a/wagtail/contrib/forms/migrations/0002_add_verbose_names.py +++ b/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 diff --git a/wagtail/contrib/forms/migrations/0003_capitalizeverbose.py b/wagtail/contrib/forms/migrations/0003_capitalizeverbose.py index 85c9bdbe4..84160932e 100644 --- a/wagtail/contrib/forms/migrations/0003_capitalizeverbose.py +++ b/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 diff --git a/wagtail/contrib/forms/models.py b/wagtail/contrib/forms/models.py index 2a59d6d52..2307c8633 100644 --- a/wagtail/contrib/forms/models.py +++ b/wagtail/contrib/forms/models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import json import os diff --git a/wagtail/contrib/forms/tests/test_forms.py b/wagtail/contrib/forms/tests/test_forms.py index d623b81cf..81784497b 100644 --- a/wagtail/contrib/forms/tests/test_forms.py +++ b/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 diff --git a/wagtail/contrib/forms/tests/test_models.py b/wagtail/contrib/forms/tests/test_models.py index 6701ec310..ccf362ed6 100644 --- a/wagtail/contrib/forms/tests/test_models.py +++ b/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 diff --git a/wagtail/contrib/forms/tests/test_views.py b/wagtail/contrib/forms/tests/test_views.py index 9587f7465..c4838dabf 100644 --- a/wagtail/contrib/forms/tests/test_views.py +++ b/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 diff --git a/wagtail/contrib/forms/tests/utils.py b/wagtail/contrib/forms/tests/utils.py index c09dc8bdd..7dd5918ae 100644 --- a/wagtail/contrib/forms/tests/utils.py +++ b/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 diff --git a/wagtail/contrib/forms/urls.py b/wagtail/contrib/forms/urls.py index d2a748190..a07200d9f 100644 --- a/wagtail/contrib/forms/urls.py +++ b/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 diff --git a/wagtail/contrib/forms/views.py b/wagtail/contrib/forms/views.py index e2fe39a19..e08b2241e 100644 --- a/wagtail/contrib/forms/views.py +++ b/wagtail/contrib/forms/views.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import csv import datetime diff --git a/wagtail/contrib/forms/wagtail_hooks.py b/wagtail/contrib/forms/wagtail_hooks.py index b6a6dbb86..7df3c1028 100644 --- a/wagtail/contrib/forms/wagtail_hooks.py +++ b/wagtail/contrib/forms/wagtail_hooks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import include, url from django.urls import reverse from django.utils.translation import ugettext_lazy as _ diff --git a/wagtail/contrib/frontend_cache/apps.py b/wagtail/contrib/frontend_cache/apps.py index f18e8bc17..0484c8b65 100644 --- a/wagtail/contrib/frontend_cache/apps.py +++ b/wagtail/contrib/frontend_cache/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import AppConfig from wagtail.contrib.frontend_cache.signal_handlers import register_signal_handlers diff --git a/wagtail/contrib/frontend_cache/backends.py b/wagtail/contrib/frontend_cache/backends.py index 4c24bb1e5..a36c4c5ef 100644 --- a/wagtail/contrib/frontend_cache/backends.py +++ b/wagtail/contrib/frontend_cache/backends.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import logging import uuid from collections import defaultdict diff --git a/wagtail/contrib/frontend_cache/signal_handlers.py b/wagtail/contrib/frontend_cache/signal_handlers.py index bd2e40511..b537bf6e0 100644 --- a/wagtail/contrib/frontend_cache/signal_handlers.py +++ b/wagtail/contrib/frontend_cache/signal_handlers.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import apps from wagtail.contrib.frontend_cache.utils import purge_page_from_cache diff --git a/wagtail/contrib/frontend_cache/tests.py b/wagtail/contrib/frontend_cache/tests.py index fdec8bb82..172d43519 100644 --- a/wagtail/contrib/frontend_cache/tests.py +++ b/wagtail/contrib/frontend_cache/tests.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import mock from django.core.exceptions import ImproperlyConfigured from django.test import TestCase diff --git a/wagtail/contrib/frontend_cache/utils.py b/wagtail/contrib/frontend_cache/utils.py index dc2e26de2..847f69c3b 100644 --- a/wagtail/contrib/frontend_cache/utils.py +++ b/wagtail/contrib/frontend_cache/utils.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import logging from django.conf import settings diff --git a/wagtail/contrib/modeladmin/forms.py b/wagtail/contrib/modeladmin/forms.py index 9357b69ad..9a4279b24 100644 --- a/wagtail/contrib/modeladmin/forms.py +++ b/wagtail/contrib/modeladmin/forms.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django import forms from django.utils.safestring import mark_safe from django.utils.translation import ugettext as _ diff --git a/wagtail/contrib/modeladmin/helpers/button.py b/wagtail/contrib/modeladmin/helpers/button.py index f26252f0d..62802c6d5 100644 --- a/wagtail/contrib/modeladmin/helpers/button.py +++ b/wagtail/contrib/modeladmin/helpers/button.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.contrib.admin.utils import quote from django.utils.encoding import force_text from django.utils.translation import ugettext as _ diff --git a/wagtail/contrib/modeladmin/helpers/permission.py b/wagtail/contrib/modeladmin/helpers/permission.py index 1acbdb3e4..3d7b1c516 100644 --- a/wagtail/contrib/modeladmin/helpers/permission.py +++ b/wagtail/contrib/modeladmin/helpers/permission.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.contrib.auth import get_permission_codename from django.contrib.auth.models import Permission from django.contrib.contenttypes.models import ContentType diff --git a/wagtail/contrib/modeladmin/helpers/url.py b/wagtail/contrib/modeladmin/helpers/url.py index 95097faee..9b01261e8 100644 --- a/wagtail/contrib/modeladmin/helpers/url.py +++ b/wagtail/contrib/modeladmin/helpers/url.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.urls import reverse from django.utils.functional import cached_property from django.utils.http import urlquote diff --git a/wagtail/contrib/modeladmin/menus.py b/wagtail/contrib/modeladmin/menus.py index 6cf1a9f70..834d78af8 100644 --- a/wagtail/contrib/modeladmin/menus.py +++ b/wagtail/contrib/modeladmin/menus.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from wagtail.admin.menu import Menu, MenuItem, SubmenuMenuItem diff --git a/wagtail/contrib/modeladmin/mixins.py b/wagtail/contrib/modeladmin/mixins.py index 9e5032c8b..1366f929e 100644 --- a/wagtail/contrib/modeladmin/mixins.py +++ b/wagtail/contrib/modeladmin/mixins.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf import settings from django.core.exceptions import ImproperlyConfigured from django.forms.utils import flatatt diff --git a/wagtail/contrib/modeladmin/options.py b/wagtail/contrib/modeladmin/options.py index 9e873e3c0..a2e863e99 100644 --- a/wagtail/contrib/modeladmin/options.py +++ b/wagtail/contrib/modeladmin/options.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import url from django.contrib.auth.models import Permission from django.core.exceptions import ImproperlyConfigured diff --git a/wagtail/contrib/modeladmin/templatetags/modeladmin_tags.py b/wagtail/contrib/modeladmin/templatetags/modeladmin_tags.py index 9a842c621..909fcc5bf 100644 --- a/wagtail/contrib/modeladmin/templatetags/modeladmin_tags.py +++ b/wagtail/contrib/modeladmin/templatetags/modeladmin_tags.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import datetime from django.contrib.admin.templatetags.admin_list import ResultList, result_headers diff --git a/wagtail/contrib/modeladmin/tests/test_page_modeladmin.py b/wagtail/contrib/modeladmin/tests/test_page_modeladmin.py index 4ccbc3980..a54089087 100644 --- a/wagtail/contrib/modeladmin/tests/test_page_modeladmin.py +++ b/wagtail/contrib/modeladmin/tests/test_page_modeladmin.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.test import TestCase diff --git a/wagtail/contrib/modeladmin/tests/test_simple_modeladmin.py b/wagtail/contrib/modeladmin/tests/test_simple_modeladmin.py index 864041fcd..501613795 100644 --- a/wagtail/contrib/modeladmin/tests/test_simple_modeladmin.py +++ b/wagtail/contrib/modeladmin/tests/test_simple_modeladmin.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import mock from django.contrib.auth import get_user_model from django.contrib.auth.models import Group diff --git a/wagtail/contrib/modeladmin/views.py b/wagtail/contrib/modeladmin/views.py index 2aa087281..b197f8f06 100644 --- a/wagtail/contrib/modeladmin/views.py +++ b/wagtail/contrib/modeladmin/views.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import operator import sys from collections import OrderedDict diff --git a/wagtail/contrib/postgres_search/apps.py b/wagtail/contrib/postgres_search/apps.py index 530fdb72a..169c2fb23 100644 --- a/wagtail/contrib/postgres_search/apps.py +++ b/wagtail/contrib/postgres_search/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, unicode_literals - from django.apps import AppConfig from django.core.checks import Error, Tags, register diff --git a/wagtail/contrib/postgres_search/backend.py b/wagtail/contrib/postgres_search/backend.py index 86f55248e..3d4f60fb4 100644 --- a/wagtail/contrib/postgres_search/backend.py +++ b/wagtail/contrib/postgres_search/backend.py @@ -1,7 +1,5 @@ # coding: utf-8 -from __future__ import absolute_import, unicode_literals - from django.contrib.postgres.search import SearchQuery, SearchRank, SearchVector from django.db import DEFAULT_DB_ALIAS, NotSupportedError, connections, transaction from django.db.models import F, Manager, TextField, Value diff --git a/wagtail/contrib/postgres_search/migrations/0001_initial.py b/wagtail/contrib/postgres_search/migrations/0001_initial.py index 66db429ad..73fbd0efd 100644 --- a/wagtail/contrib/postgres_search/migrations/0001_initial.py +++ b/wagtail/contrib/postgres_search/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.1 on 2017-03-22 14:53 -from __future__ import unicode_literals - import django.db.models.deletion from django.db import migrations, models diff --git a/wagtail/contrib/postgres_search/models.py b/wagtail/contrib/postgres_search/models.py index 783f89c64..96e1d2297 100644 --- a/wagtail/contrib/postgres_search/models.py +++ b/wagtail/contrib/postgres_search/models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import apps from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation from django.contrib.contenttypes.models import ContentType diff --git a/wagtail/contrib/postgres_search/tests/test_backend.py b/wagtail/contrib/postgres_search/tests/test_backend.py index bb6e9c942..bbb5efbbd 100644 --- a/wagtail/contrib/postgres_search/tests/test_backend.py +++ b/wagtail/contrib/postgres_search/tests/test_backend.py @@ -1,6 +1,4 @@ # coding: utf-8 -from __future__ import absolute_import, unicode_literals - import unittest from django.test import TestCase diff --git a/wagtail/contrib/postgres_search/utils.py b/wagtail/contrib/postgres_search/utils.py index a90049017..04effaac6 100644 --- a/wagtail/contrib/postgres_search/utils.py +++ b/wagtail/contrib/postgres_search/utils.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, unicode_literals - import operator import re from functools import partial, reduce diff --git a/wagtail/contrib/redirects/apps.py b/wagtail/contrib/redirects/apps.py index 5322a0c63..80cb32e2a 100644 --- a/wagtail/contrib/redirects/apps.py +++ b/wagtail/contrib/redirects/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import AppConfig diff --git a/wagtail/contrib/redirects/forms.py b/wagtail/contrib/redirects/forms.py index 5a51f43ff..be014ec8d 100644 --- a/wagtail/contrib/redirects/forms.py +++ b/wagtail/contrib/redirects/forms.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django import forms from django.utils.translation import ugettext_lazy as _ diff --git a/wagtail/contrib/redirects/middleware.py b/wagtail/contrib/redirects/middleware.py index aa8eccc2e..edd7328a9 100644 --- a/wagtail/contrib/redirects/middleware.py +++ b/wagtail/contrib/redirects/middleware.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from urllib.parse import urlparse from django import http diff --git a/wagtail/contrib/redirects/migrations/0001_initial.py b/wagtail/contrib/redirects/migrations/0001_initial.py index 600e03e9e..888a4c0ac 100644 --- a/wagtail/contrib/redirects/migrations/0001_initial.py +++ b/wagtail/contrib/redirects/migrations/0001_initial.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/contrib/redirects/migrations/0002_add_verbose_names.py b/wagtail/contrib/redirects/migrations/0002_add_verbose_names.py index 07bb50e23..16bb16672 100644 --- a/wagtail/contrib/redirects/migrations/0002_add_verbose_names.py +++ b/wagtail/contrib/redirects/migrations/0002_add_verbose_names.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/contrib/redirects/migrations/0003_make_site_field_editable.py b/wagtail/contrib/redirects/migrations/0003_make_site_field_editable.py index 1a27904f3..1540fb099 100644 --- a/wagtail/contrib/redirects/migrations/0003_make_site_field_editable.py +++ b/wagtail/contrib/redirects/migrations/0003_make_site_field_editable.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/contrib/redirects/migrations/0004_set_unique_on_path_and_site.py b/wagtail/contrib/redirects/migrations/0004_set_unique_on_path_and_site.py index 7f1b6970a..64183ab6d 100644 --- a/wagtail/contrib/redirects/migrations/0004_set_unique_on_path_and_site.py +++ b/wagtail/contrib/redirects/migrations/0004_set_unique_on_path_and_site.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/contrib/redirects/migrations/0005_capitalizeverbose.py b/wagtail/contrib/redirects/migrations/0005_capitalizeverbose.py index 8ee4e7991..92c4ede6c 100644 --- a/wagtail/contrib/redirects/migrations/0005_capitalizeverbose.py +++ b/wagtail/contrib/redirects/migrations/0005_capitalizeverbose.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/contrib/redirects/models.py b/wagtail/contrib/redirects/models.py index d94992493..f389e4ed8 100644 --- a/wagtail/contrib/redirects/models.py +++ b/wagtail/contrib/redirects/models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from urllib.parse import urlparse from django.db import models diff --git a/wagtail/contrib/redirects/permissions.py b/wagtail/contrib/redirects/permissions.py index 8a44b556e..976b2828d 100644 --- a/wagtail/contrib/redirects/permissions.py +++ b/wagtail/contrib/redirects/permissions.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from wagtail.core.permission_policies import ModelPermissionPolicy from wagtail.contrib.redirects.models import Redirect diff --git a/wagtail/contrib/redirects/tests.py b/wagtail/contrib/redirects/tests.py index 412020f9c..65d45263a 100644 --- a/wagtail/contrib/redirects/tests.py +++ b/wagtail/contrib/redirects/tests.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, unicode_literals - from django.test import TestCase, override_settings from django.urls import reverse diff --git a/wagtail/contrib/redirects/urls.py b/wagtail/contrib/redirects/urls.py index be45c4336..e6a90223e 100644 --- a/wagtail/contrib/redirects/urls.py +++ b/wagtail/contrib/redirects/urls.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import url from wagtail.contrib.redirects import views diff --git a/wagtail/contrib/redirects/views.py b/wagtail/contrib/redirects/views.py index 2a5b1b3f1..d1e309531 100644 --- a/wagtail/contrib/redirects/views.py +++ b/wagtail/contrib/redirects/views.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse from django.utils.translation import ugettext as _ diff --git a/wagtail/contrib/redirects/wagtail_hooks.py b/wagtail/contrib/redirects/wagtail_hooks.py index 385635b62..2ef8bf1a5 100644 --- a/wagtail/contrib/redirects/wagtail_hooks.py +++ b/wagtail/contrib/redirects/wagtail_hooks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import include, url from django.contrib.auth.models import Permission from django.urls import reverse diff --git a/wagtail/contrib/routable_page/apps.py b/wagtail/contrib/routable_page/apps.py index 416f42993..ae7d1c808 100644 --- a/wagtail/contrib/routable_page/apps.py +++ b/wagtail/contrib/routable_page/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import AppConfig diff --git a/wagtail/contrib/routable_page/models.py b/wagtail/contrib/routable_page/models.py index c45f7d60a..f638fcd1c 100644 --- a/wagtail/contrib/routable_page/models.py +++ b/wagtail/contrib/routable_page/models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import url from django.http import Http404 from django.template.response import TemplateResponse diff --git a/wagtail/contrib/routable_page/templatetags/wagtailroutablepage_tags.py b/wagtail/contrib/routable_page/templatetags/wagtailroutablepage_tags.py index 8c4d3e60f..6af9cb315 100644 --- a/wagtail/contrib/routable_page/templatetags/wagtailroutablepage_tags.py +++ b/wagtail/contrib/routable_page/templatetags/wagtailroutablepage_tags.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django import template register = template.Library() diff --git a/wagtail/contrib/routable_page/tests.py b/wagtail/contrib/routable_page/tests.py index f86fc3820..4dcbe3b98 100644 --- a/wagtail/contrib/routable_page/tests.py +++ b/wagtail/contrib/routable_page/tests.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import mock from django.test import RequestFactory, TestCase from django.urls.exceptions import NoReverseMatch diff --git a/wagtail/contrib/search_promotions/admin_urls.py b/wagtail/contrib/search_promotions/admin_urls.py index cbd73d754..c6e2336d8 100644 --- a/wagtail/contrib/search_promotions/admin_urls.py +++ b/wagtail/contrib/search_promotions/admin_urls.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import url from wagtail.contrib.search_promotions import views diff --git a/wagtail/contrib/search_promotions/apps.py b/wagtail/contrib/search_promotions/apps.py index 59364a35c..370903d22 100644 --- a/wagtail/contrib/search_promotions/apps.py +++ b/wagtail/contrib/search_promotions/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import AppConfig diff --git a/wagtail/contrib/search_promotions/forms.py b/wagtail/contrib/search_promotions/forms.py index 58d995a60..819ef2e95 100644 --- a/wagtail/contrib/search_promotions/forms.py +++ b/wagtail/contrib/search_promotions/forms.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django import forms from django.forms.models import inlineformset_factory from django.utils.translation import ugettext_lazy as _ diff --git a/wagtail/contrib/search_promotions/migrations/0001_initial.py b/wagtail/contrib/search_promotions/migrations/0001_initial.py index 3084c8c8a..8dbfeb215 100644 --- a/wagtail/contrib/search_promotions/migrations/0001_initial.py +++ b/wagtail/contrib/search_promotions/migrations/0001_initial.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/contrib/search_promotions/migrations/0002_capitalizeverbose.py b/wagtail/contrib/search_promotions/migrations/0002_capitalizeverbose.py index 0d0ec106e..ec047199e 100644 --- a/wagtail/contrib/search_promotions/migrations/0002_capitalizeverbose.py +++ b/wagtail/contrib/search_promotions/migrations/0002_capitalizeverbose.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/contrib/search_promotions/models.py b/wagtail/contrib/search_promotions/models.py index 4de3f24ed..a0d3c6c93 100644 --- a/wagtail/contrib/search_promotions/models.py +++ b/wagtail/contrib/search_promotions/models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.db import models from django.utils.translation import ugettext_lazy as _ diff --git a/wagtail/contrib/search_promotions/templatetags/wagtailsearchpromotions_tags.py b/wagtail/contrib/search_promotions/templatetags/wagtailsearchpromotions_tags.py index 7a53cd81c..3890801a6 100644 --- a/wagtail/contrib/search_promotions/templatetags/wagtailsearchpromotions_tags.py +++ b/wagtail/contrib/search_promotions/templatetags/wagtailsearchpromotions_tags.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django import template from wagtail.contrib.search_promotions.models import SearchPromotion diff --git a/wagtail/contrib/search_promotions/tests.py b/wagtail/contrib/search_promotions/tests.py index c025d31fc..874bb48fc 100644 --- a/wagtail/contrib/search_promotions/tests.py +++ b/wagtail/contrib/search_promotions/tests.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.test import TestCase from django.urls import reverse diff --git a/wagtail/contrib/search_promotions/views.py b/wagtail/contrib/search_promotions/views.py index d3b30aa32..fc9eaa7cd 100644 --- a/wagtail/contrib/search_promotions/views.py +++ b/wagtail/contrib/search_promotions/views.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse from django.utils.translation import ugettext as _ diff --git a/wagtail/contrib/search_promotions/wagtail_hooks.py b/wagtail/contrib/search_promotions/wagtail_hooks.py index 50d539b12..b8849b368 100644 --- a/wagtail/contrib/search_promotions/wagtail_hooks.py +++ b/wagtail/contrib/search_promotions/wagtail_hooks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import include, url from django.contrib.auth.models import Permission from django.urls import reverse diff --git a/wagtail/contrib/settings/apps.py b/wagtail/contrib/settings/apps.py index c0fc32bd1..f907279ff 100644 --- a/wagtail/contrib/settings/apps.py +++ b/wagtail/contrib/settings/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import AppConfig diff --git a/wagtail/contrib/settings/context_processors.py b/wagtail/contrib/settings/context_processors.py index 06af26034..92ccc474d 100644 --- a/wagtail/contrib/settings/context_processors.py +++ b/wagtail/contrib/settings/context_processors.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from .registry import registry diff --git a/wagtail/contrib/settings/forms.py b/wagtail/contrib/settings/forms.py index 9f778a614..c1d1e48fc 100644 --- a/wagtail/contrib/settings/forms.py +++ b/wagtail/contrib/settings/forms.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django import forms from django.urls import reverse diff --git a/wagtail/contrib/settings/jinja2tags.py b/wagtail/contrib/settings/jinja2tags.py index 629970f41..5b7af922f 100644 --- a/wagtail/contrib/settings/jinja2tags.py +++ b/wagtail/contrib/settings/jinja2tags.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from weakref import WeakKeyDictionary import jinja2 diff --git a/wagtail/contrib/settings/models.py b/wagtail/contrib/settings/models.py index ce44cf3eb..3d7b0f291 100644 --- a/wagtail/contrib/settings/models.py +++ b/wagtail/contrib/settings/models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.db import models from .registry import register_setting diff --git a/wagtail/contrib/settings/permissions.py b/wagtail/contrib/settings/permissions.py index 306698193..161a2699c 100644 --- a/wagtail/contrib/settings/permissions.py +++ b/wagtail/contrib/settings/permissions.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - def user_can_edit_setting_type(user, model): """ Check if a user has permission to edit this setting type """ diff --git a/wagtail/contrib/settings/registry.py b/wagtail/contrib/settings/registry.py index 62d396ae0..8d2feccab 100644 --- a/wagtail/contrib/settings/registry.py +++ b/wagtail/contrib/settings/registry.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import apps from django.contrib.auth.models import Permission from django.urls import reverse diff --git a/wagtail/contrib/settings/templatetags/wagtailsettings_tags.py b/wagtail/contrib/settings/templatetags/wagtailsettings_tags.py index 63e1f331f..a650b3bb4 100644 --- a/wagtail/contrib/settings/templatetags/wagtailsettings_tags.py +++ b/wagtail/contrib/settings/templatetags/wagtailsettings_tags.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.template import Library from wagtail.core.models import Site diff --git a/wagtail/contrib/settings/tests/test_admin.py b/wagtail/contrib/settings/tests/test_admin.py index 2800be292..d9751796a 100644 --- a/wagtail/contrib/settings/tests/test_admin.py +++ b/wagtail/contrib/settings/tests/test_admin.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 Permission from django.test import TestCase, override_settings diff --git a/wagtail/contrib/settings/tests/test_register.py b/wagtail/contrib/settings/tests/test_register.py index 4242a9c2e..260289c73 100644 --- a/wagtail/contrib/settings/tests/test_register.py +++ b/wagtail/contrib/settings/tests/test_register.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.test import TestCase from django.urls import reverse diff --git a/wagtail/contrib/settings/tests/test_templates.py b/wagtail/contrib/settings/tests/test_templates.py index 5421cad80..f55297999 100644 --- a/wagtail/contrib/settings/tests/test_templates.py +++ b/wagtail/contrib/settings/tests/test_templates.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.template import Context, RequestContext, Template, engines from django.test import TestCase diff --git a/wagtail/contrib/settings/urls.py b/wagtail/contrib/settings/urls.py index 90eca89d0..f476cd671 100644 --- a/wagtail/contrib/settings/urls.py +++ b/wagtail/contrib/settings/urls.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import url from . import views diff --git a/wagtail/contrib/settings/views.py b/wagtail/contrib/settings/views.py index b74c85056..3b105257f 100644 --- a/wagtail/contrib/settings/views.py +++ b/wagtail/contrib/settings/views.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.core.exceptions import PermissionDenied from django.http import Http404 from django.shortcuts import get_object_or_404, redirect, render diff --git a/wagtail/contrib/settings/wagtail_hooks.py b/wagtail/contrib/settings/wagtail_hooks.py index 126867812..c2ef9097b 100644 --- a/wagtail/contrib/settings/wagtail_hooks.py +++ b/wagtail/contrib/settings/wagtail_hooks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import include, url from wagtail.core import hooks diff --git a/wagtail/contrib/sitemaps/apps.py b/wagtail/contrib/sitemaps/apps.py index db827117d..aff68e44c 100644 --- a/wagtail/contrib/sitemaps/apps.py +++ b/wagtail/contrib/sitemaps/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import AppConfig diff --git a/wagtail/contrib/sitemaps/sitemap_generator.py b/wagtail/contrib/sitemaps/sitemap_generator.py index f6651becf..49a59c3b6 100644 --- a/wagtail/contrib/sitemaps/sitemap_generator.py +++ b/wagtail/contrib/sitemaps/sitemap_generator.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.contrib.sitemaps import Sitemap as DjangoSitemap diff --git a/wagtail/contrib/sitemaps/tests.py b/wagtail/contrib/sitemaps/tests.py index 461d1e4f0..7b0288d86 100644 --- a/wagtail/contrib/sitemaps/tests.py +++ b/wagtail/contrib/sitemaps/tests.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import datetime import pytz diff --git a/wagtail/contrib/sitemaps/views.py b/wagtail/contrib/sitemaps/views.py index 986eb8d75..ecf881123 100644 --- a/wagtail/contrib/sitemaps/views.py +++ b/wagtail/contrib/sitemaps/views.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.contrib.sitemaps import views as sitemap_views from .sitemap_generator import Sitemap diff --git a/wagtail/contrib/styleguide/apps.py b/wagtail/contrib/styleguide/apps.py index 1f0d238fe..92cce2f10 100644 --- a/wagtail/contrib/styleguide/apps.py +++ b/wagtail/contrib/styleguide/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import AppConfig diff --git a/wagtail/contrib/styleguide/tests.py b/wagtail/contrib/styleguide/tests.py index 6e2cc8e60..c06a464ea 100644 --- a/wagtail/contrib/styleguide/tests.py +++ b/wagtail/contrib/styleguide/tests.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.test import TestCase from django.urls import reverse diff --git a/wagtail/contrib/styleguide/views.py b/wagtail/contrib/styleguide/views.py index e6d725fcf..91169d34e 100644 --- a/wagtail/contrib/styleguide/views.py +++ b/wagtail/contrib/styleguide/views.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django import forms from django.core.paginator import Paginator from django.shortcuts import render diff --git a/wagtail/contrib/styleguide/wagtail_hooks.py b/wagtail/contrib/styleguide/wagtail_hooks.py index a05fa18b3..b54ecd761 100644 --- a/wagtail/contrib/styleguide/wagtail_hooks.py +++ b/wagtail/contrib/styleguide/wagtail_hooks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import url from django.urls import reverse from django.utils.translation import ugettext_lazy as _ diff --git a/wagtail/contrib/table_block/blocks.py b/wagtail/contrib/table_block/blocks.py index 58b5636b0..7825cc19c 100644 --- a/wagtail/contrib/table_block/blocks.py +++ b/wagtail/contrib/table_block/blocks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import json from django import forms diff --git a/wagtail/contrib/table_block/tests.py b/wagtail/contrib/table_block/tests.py index 01985e52d..7690df05d 100644 --- a/wagtail/contrib/table_block/tests.py +++ b/wagtail/contrib/table_block/tests.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.test import TestCase from django.utils.html import escape diff --git a/wagtail/core/__init__.py b/wagtail/core/__init__.py index 040cb7f90..cc7580a49 100644 --- a/wagtail/core/__init__.py +++ b/wagtail/core/__init__.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - # Imported for historical reasons from wagtail import __semver__, __version__ # noqa diff --git a/wagtail/core/admin.py b/wagtail/core/admin.py index bfa3c7bc9..0ddda283f 100644 --- a/wagtail/core/admin.py +++ b/wagtail/core/admin.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.contrib import admin from django.contrib.auth.admin import GroupAdmin from django.contrib.auth.models import Group diff --git a/wagtail/core/apps.py b/wagtail/core/apps.py index 3fe49dc98..dd6ee6943 100644 --- a/wagtail/core/apps.py +++ b/wagtail/core/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import AppConfig diff --git a/wagtail/core/blocks/__init__.py b/wagtail/core/blocks/__init__.py index 538180f47..a2fc986b4 100644 --- a/wagtail/core/blocks/__init__.py +++ b/wagtail/core/blocks/__init__.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - # Import block types defined in submodules into the wagtail.core.blocks namespace from .base import * # NOQA from .field_block import * # NOQA diff --git a/wagtail/core/blocks/base.py b/wagtail/core/blocks/base.py index 1566931a8..962a5dc50 100644 --- a/wagtail/core/blocks/base.py +++ b/wagtail/core/blocks/base.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import collections from importlib import import_module diff --git a/wagtail/core/blocks/field_block.py b/wagtail/core/blocks/field_block.py index fb870e18b..9b16f8030 100644 --- a/wagtail/core/blocks/field_block.py +++ b/wagtail/core/blocks/field_block.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import datetime from django import forms diff --git a/wagtail/core/blocks/list_block.py b/wagtail/core/blocks/list_block.py index 771f4f18e..4320eabb7 100644 --- a/wagtail/core/blocks/list_block.py +++ b/wagtail/core/blocks/list_block.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django import forms from django.contrib.staticfiles.templatetags.staticfiles import static from django.core.exceptions import ValidationError diff --git a/wagtail/core/blocks/static_block.py b/wagtail/core/blocks/static_block.py index f785e42f8..ffd0335d9 100644 --- a/wagtail/core/blocks/static_block.py +++ b/wagtail/core/blocks/static_block.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.utils.translation import ugettext_lazy as _ from .base import Block diff --git a/wagtail/core/blocks/stream_block.py b/wagtail/core/blocks/stream_block.py index 6df20f44f..e820a65e2 100644 --- a/wagtail/core/blocks/stream_block.py +++ b/wagtail/core/blocks/stream_block.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import collections import uuid diff --git a/wagtail/core/blocks/struct_block.py b/wagtail/core/blocks/struct_block.py index 89c90e9b4..1e1f0b33a 100644 --- a/wagtail/core/blocks/struct_block.py +++ b/wagtail/core/blocks/struct_block.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import collections from django import forms diff --git a/wagtail/core/blocks/utils.py b/wagtail/core/blocks/utils.py index 80be6bdba..19c3eb927 100644 --- a/wagtail/core/blocks/utils.py +++ b/wagtail/core/blocks/utils.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import re diff --git a/wagtail/core/compat.py b/wagtail/core/compat.py index 222aa3966..c754d0631 100644 --- a/wagtail/core/compat.py +++ b/wagtail/core/compat.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf import settings from django.core.exceptions import ImproperlyConfigured diff --git a/wagtail/core/fields.py b/wagtail/core/fields.py index 8c11560af..a0e0c0bd8 100644 --- a/wagtail/core/fields.py +++ b/wagtail/core/fields.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import json from django.core.serializers.json import DjangoJSONEncoder diff --git a/wagtail/core/forms.py b/wagtail/core/forms.py index 06ae2317a..2a38d52c7 100644 --- a/wagtail/core/forms.py +++ b/wagtail/core/forms.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django import forms from django.utils.translation import ugettext as _ from django.utils.translation import ugettext_lazy diff --git a/wagtail/core/hooks.py b/wagtail/core/hooks.py index 741afe7ce..5b9dcdcad 100644 --- a/wagtail/core/hooks.py +++ b/wagtail/core/hooks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from operator import itemgetter from wagtail.utils.apps import get_app_submodules diff --git a/wagtail/core/jinja2tags.py b/wagtail/core/jinja2tags.py index 5199c00fb..50bd5c52f 100644 --- a/wagtail/core/jinja2tags.py +++ b/wagtail/core/jinja2tags.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import jinja2 import jinja2.nodes from jinja2.ext import Extension diff --git a/wagtail/core/management/commands/fixtree.py b/wagtail/core/management/commands/fixtree.py index e86904c69..e73d39432 100644 --- a/wagtail/core/management/commands/fixtree.py +++ b/wagtail/core/management/commands/fixtree.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import functools import operator diff --git a/wagtail/core/management/commands/move_pages.py b/wagtail/core/management/commands/move_pages.py index 101baf893..3968b3d20 100644 --- a/wagtail/core/management/commands/move_pages.py +++ b/wagtail/core/management/commands/move_pages.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.core.management.base import BaseCommand from wagtail.core.models import Page diff --git a/wagtail/core/management/commands/publish_scheduled_pages.py b/wagtail/core/management/commands/publish_scheduled_pages.py index 7c29e4808..cf99c7ade 100644 --- a/wagtail/core/management/commands/publish_scheduled_pages.py +++ b/wagtail/core/management/commands/publish_scheduled_pages.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import json from django.core.management.base import BaseCommand diff --git a/wagtail/core/management/commands/replace_text.py b/wagtail/core/management/commands/replace_text.py index dd08992c7..badd44c13 100644 --- a/wagtail/core/management/commands/replace_text.py +++ b/wagtail/core/management/commands/replace_text.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.core.management.base import BaseCommand from django.db import models from modelcluster.models import get_all_child_relations diff --git a/wagtail/core/management/commands/set_url_paths.py b/wagtail/core/management/commands/set_url_paths.py index bb92d12c1..9739fc11c 100644 --- a/wagtail/core/management/commands/set_url_paths.py +++ b/wagtail/core/management/commands/set_url_paths.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.core.management.base import BaseCommand from wagtail.core.models import Page diff --git a/wagtail/core/middleware.py b/wagtail/core/middleware.py index e899ed305..5fb3f885c 100644 --- a/wagtail/core/middleware.py +++ b/wagtail/core/middleware.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.utils.deprecation import MiddlewareMixin from wagtail.core.models import Site diff --git a/wagtail/core/migrations/0001_initial.py b/wagtail/core/migrations/0001_initial.py index bc7a48f60..56526ebae 100644 --- a/wagtail/core/migrations/0001_initial.py +++ b/wagtail/core/migrations/0001_initial.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.conf import settings from django.db import migrations, models diff --git a/wagtail/core/migrations/0001_squashed_0016_change_page_url_path_to_text_field.py b/wagtail/core/migrations/0001_squashed_0016_change_page_url_path_to_text_field.py index 9d40a455e..852aa22c5 100644 --- a/wagtail/core/migrations/0001_squashed_0016_change_page_url_path_to_text_field.py +++ b/wagtail/core/migrations/0001_squashed_0016_change_page_url_path_to_text_field.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - import django.db.models.deletion from django.conf import settings from django.db import migrations, models diff --git a/wagtail/core/migrations/0002_initial_data.py b/wagtail/core/migrations/0002_initial_data.py index 42a11aef7..97a31f6d4 100644 --- a/wagtail/core/migrations/0002_initial_data.py +++ b/wagtail/core/migrations/0002_initial_data.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/wagtail/core/migrations/0003_add_uniqueness_constraint_on_group_page_permission.py b/wagtail/core/migrations/0003_add_uniqueness_constraint_on_group_page_permission.py index fca686e16..8c91231f3 100644 --- a/wagtail/core/migrations/0003_add_uniqueness_constraint_on_group_page_permission.py +++ b/wagtail/core/migrations/0003_add_uniqueness_constraint_on_group_page_permission.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0004_page_locked.py b/wagtail/core/migrations/0004_page_locked.py index 83b266c30..41067c39f 100644 --- a/wagtail/core/migrations/0004_page_locked.py +++ b/wagtail/core/migrations/0004_page_locked.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0005_add_page_lock_permission_to_moderators.py b/wagtail/core/migrations/0005_add_page_lock_permission_to_moderators.py index 0950e7d5a..b83a81f3b 100644 --- a/wagtail/core/migrations/0005_add_page_lock_permission_to_moderators.py +++ b/wagtail/core/migrations/0005_add_page_lock_permission_to_moderators.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/wagtail/core/migrations/0006_add_lock_page_permission.py b/wagtail/core/migrations/0006_add_lock_page_permission.py index 9bd842ab4..7fa35b3d9 100644 --- a/wagtail/core/migrations/0006_add_lock_page_permission.py +++ b/wagtail/core/migrations/0006_add_lock_page_permission.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0007_page_latest_revision_created_at.py b/wagtail/core/migrations/0007_page_latest_revision_created_at.py index 00468244f..066c9f8fd 100644 --- a/wagtail/core/migrations/0007_page_latest_revision_created_at.py +++ b/wagtail/core/migrations/0007_page_latest_revision_created_at.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0008_populate_latest_revision_created_at.py b/wagtail/core/migrations/0008_populate_latest_revision_created_at.py index 03776f96c..616f81813 100644 --- a/wagtail/core/migrations/0008_populate_latest_revision_created_at.py +++ b/wagtail/core/migrations/0008_populate_latest_revision_created_at.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/wagtail/core/migrations/0009_remove_auto_now_add_from_pagerevision_created_at.py b/wagtail/core/migrations/0009_remove_auto_now_add_from_pagerevision_created_at.py index 534957ac6..e67c8e987 100644 --- a/wagtail/core/migrations/0009_remove_auto_now_add_from_pagerevision_created_at.py +++ b/wagtail/core/migrations/0009_remove_auto_now_add_from_pagerevision_created_at.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0010_change_page_owner_to_null_on_delete.py b/wagtail/core/migrations/0010_change_page_owner_to_null_on_delete.py index e8818aa3f..c82549b3e 100644 --- a/wagtail/core/migrations/0010_change_page_owner_to_null_on_delete.py +++ b/wagtail/core/migrations/0010_change_page_owner_to_null_on_delete.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - import django.db.models.deletion from django.conf import settings from django.db import migrations, models diff --git a/wagtail/core/migrations/0011_page_first_published_at.py b/wagtail/core/migrations/0011_page_first_published_at.py index cd8bedf33..466f33e97 100644 --- a/wagtail/core/migrations/0011_page_first_published_at.py +++ b/wagtail/core/migrations/0011_page_first_published_at.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0012_extend_page_slug_field.py b/wagtail/core/migrations/0012_extend_page_slug_field.py index 9cb43f387..48ce8fc42 100644 --- a/wagtail/core/migrations/0012_extend_page_slug_field.py +++ b/wagtail/core/migrations/0012_extend_page_slug_field.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0013_update_golive_expire_help_text.py b/wagtail/core/migrations/0013_update_golive_expire_help_text.py index 6ef67db38..cf379f3d5 100644 --- a/wagtail/core/migrations/0013_update_golive_expire_help_text.py +++ b/wagtail/core/migrations/0013_update_golive_expire_help_text.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0014_add_verbose_name.py b/wagtail/core/migrations/0014_add_verbose_name.py index b9221d415..dc2f9f064 100644 --- a/wagtail/core/migrations/0014_add_verbose_name.py +++ b/wagtail/core/migrations/0014_add_verbose_name.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0015_add_more_verbose_names.py b/wagtail/core/migrations/0015_add_more_verbose_names.py index e2e02c026..4fc485b2b 100644 --- a/wagtail/core/migrations/0015_add_more_verbose_names.py +++ b/wagtail/core/migrations/0015_add_more_verbose_names.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - import django.db.models.deletion from django.conf import settings from django.db import migrations, models diff --git a/wagtail/core/migrations/0016_change_page_url_path_to_text_field.py b/wagtail/core/migrations/0016_change_page_url_path_to_text_field.py index 387dea542..ea60553cf 100644 --- a/wagtail/core/migrations/0016_change_page_url_path_to_text_field.py +++ b/wagtail/core/migrations/0016_change_page_url_path_to_text_field.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0017_change_edit_page_permission_description.py b/wagtail/core/migrations/0017_change_edit_page_permission_description.py index dc004258f..8a1848ba6 100644 --- a/wagtail/core/migrations/0017_change_edit_page_permission_description.py +++ b/wagtail/core/migrations/0017_change_edit_page_permission_description.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0018_pagerevision_submitted_for_moderation_index.py b/wagtail/core/migrations/0018_pagerevision_submitted_for_moderation_index.py index 0ecca47fa..a282f9667 100644 --- a/wagtail/core/migrations/0018_pagerevision_submitted_for_moderation_index.py +++ b/wagtail/core/migrations/0018_pagerevision_submitted_for_moderation_index.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0019_verbose_names_cleanup.py b/wagtail/core/migrations/0019_verbose_names_cleanup.py index a2b608a95..85b71da44 100644 --- a/wagtail/core/migrations/0019_verbose_names_cleanup.py +++ b/wagtail/core/migrations/0019_verbose_names_cleanup.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/wagtail/core/migrations/0020_add_index_on_page_first_published_at.py b/wagtail/core/migrations/0020_add_index_on_page_first_published_at.py index dd732c7cb..05485f92d 100644 --- a/wagtail/core/migrations/0020_add_index_on_page_first_published_at.py +++ b/wagtail/core/migrations/0020_add_index_on_page_first_published_at.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0021_capitalizeverbose.py b/wagtail/core/migrations/0021_capitalizeverbose.py index 787907081..df470ef76 100644 --- a/wagtail/core/migrations/0021_capitalizeverbose.py +++ b/wagtail/core/migrations/0021_capitalizeverbose.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - import django.db.models.deletion from django.conf import settings from django.db import migrations, models diff --git a/wagtail/core/migrations/0022_add_site_name.py b/wagtail/core/migrations/0022_add_site_name.py index 90353a4ae..257ca4923 100644 --- a/wagtail/core/migrations/0022_add_site_name.py +++ b/wagtail/core/migrations/0022_add_site_name.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0023_alter_page_revision_on_delete_behaviour.py b/wagtail/core/migrations/0023_alter_page_revision_on_delete_behaviour.py index 461a9f452..cf111f833 100644 --- a/wagtail/core/migrations/0023_alter_page_revision_on_delete_behaviour.py +++ b/wagtail/core/migrations/0023_alter_page_revision_on_delete_behaviour.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - import django.db.models.deletion from django.conf import settings from django.db import migrations, models diff --git a/wagtail/core/migrations/0024_alter_page_content_type_on_delete_behaviour.py b/wagtail/core/migrations/0024_alter_page_content_type_on_delete_behaviour.py index 7d644384a..3052e3698 100644 --- a/wagtail/core/migrations/0024_alter_page_content_type_on_delete_behaviour.py +++ b/wagtail/core/migrations/0024_alter_page_content_type_on_delete_behaviour.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9 on 2015-12-22 09:34 -from __future__ import unicode_literals - from django.db import migrations, models import wagtail.core.models diff --git a/wagtail/core/migrations/0024_collection.py b/wagtail/core/migrations/0024_collection.py index 67779fb0b..26c90032e 100644 --- a/wagtail/core/migrations/0024_collection.py +++ b/wagtail/core/migrations/0024_collection.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0025_collection_initial_data.py b/wagtail/core/migrations/0025_collection_initial_data.py index 39ccdf61c..db7251fb9 100644 --- a/wagtail/core/migrations/0025_collection_initial_data.py +++ b/wagtail/core/migrations/0025_collection_initial_data.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/wagtail/core/migrations/0026_group_collection_permission.py b/wagtail/core/migrations/0026_group_collection_permission.py index b833bb62d..daa677c8a 100644 --- a/wagtail/core/migrations/0026_group_collection_permission.py +++ b/wagtail/core/migrations/0026_group_collection_permission.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0027_fix_collection_path_collation.py b/wagtail/core/migrations/0027_fix_collection_path_collation.py index 17c2081db..53d1d39eb 100644 --- a/wagtail/core/migrations/0027_fix_collection_path_collation.py +++ b/wagtail/core/migrations/0027_fix_collection_path_collation.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/wagtail/core/migrations/0028_merge.py b/wagtail/core/migrations/0028_merge.py index 573c4f2a0..5ea755a7d 100644 --- a/wagtail/core/migrations/0028_merge.py +++ b/wagtail/core/migrations/0028_merge.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.1 on 2016-02-03 13:50 -from __future__ import unicode_literals - from django.db import migrations diff --git a/wagtail/core/migrations/0029_unicode_slugfield_dj19.py b/wagtail/core/migrations/0029_unicode_slugfield_dj19.py index 3d4b34610..903567924 100644 --- a/wagtail/core/migrations/0029_unicode_slugfield_dj19.py +++ b/wagtail/core/migrations/0029_unicode_slugfield_dj19.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.4 on 2016-04-27 22:39 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0030_index_on_pagerevision_created_at.py b/wagtail/core/migrations/0030_index_on_pagerevision_created_at.py index d59228af3..a5f2d9eec 100644 --- a/wagtail/core/migrations/0030_index_on_pagerevision_created_at.py +++ b/wagtail/core/migrations/0030_index_on_pagerevision_created_at.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import models, migrations diff --git a/wagtail/core/migrations/0031_add_page_view_restriction_types.py b/wagtail/core/migrations/0031_add_page_view_restriction_types.py index b845d2253..1f42f7d82 100644 --- a/wagtail/core/migrations/0031_add_page_view_restriction_types.py +++ b/wagtail/core/migrations/0031_add_page_view_restriction_types.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.2 on 2016-10-07 15:33 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0032_add_bulk_delete_page_permission.py b/wagtail/core/migrations/0032_add_bulk_delete_page_permission.py index 672ece36d..a150e4790 100644 --- a/wagtail/core/migrations/0032_add_bulk_delete_page_permission.py +++ b/wagtail/core/migrations/0032_add_bulk_delete_page_permission.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.1 on 2016-09-27 14:11 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0033_remove_golive_expiry_help_text.py b/wagtail/core/migrations/0033_remove_golive_expiry_help_text.py index 2b870f445..f7b6ba239 100644 --- a/wagtail/core/migrations/0033_remove_golive_expiry_help_text.py +++ b/wagtail/core/migrations/0033_remove_golive_expiry_help_text.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.6 on 2017-03-31 14:33 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0034_page_live_revision.py b/wagtail/core/migrations/0034_page_live_revision.py index f7f98b579..88fe6409f 100644 --- a/wagtail/core/migrations/0034_page_live_revision.py +++ b/wagtail/core/migrations/0034_page_live_revision.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2017-01-26 21:32 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/wagtail/core/migrations/0035_page_last_published_at.py b/wagtail/core/migrations/0035_page_last_published_at.py index 234046ad7..1ad2595ab 100644 --- a/wagtail/core/migrations/0035_page_last_published_at.py +++ b/wagtail/core/migrations/0035_page_last_published_at.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.1 on 2017-05-22 13:35 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0036_populate_page_last_published_at.py b/wagtail/core/migrations/0036_populate_page_last_published_at.py index 945e212a9..f71695f6e 100644 --- a/wagtail/core/migrations/0036_populate_page_last_published_at.py +++ b/wagtail/core/migrations/0036_populate_page_last_published_at.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.1 on 2017-06-01 11:03 -from __future__ import unicode_literals - from django.db import migrations from django.db.models import F diff --git a/wagtail/core/migrations/0037_set_page_owner_editable.py b/wagtail/core/migrations/0037_set_page_owner_editable.py index 846b3a407..b632c3252 100644 --- a/wagtail/core/migrations/0037_set_page_owner_editable.py +++ b/wagtail/core/migrations/0037_set_page_owner_editable.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.7 on 2017-05-03 12:05 -from __future__ import unicode_literals - from django.conf import settings from django.db import migrations, models import django.db.models.deletion diff --git a/wagtail/core/migrations/0038_make_first_published_at_editable.py b/wagtail/core/migrations/0038_make_first_published_at_editable.py index 074bcbb70..1cfb229f4 100644 --- a/wagtail/core/migrations/0038_make_first_published_at_editable.py +++ b/wagtail/core/migrations/0038_make_first_published_at_editable.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.6 on 2017-03-24 09:12 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/core/migrations/0039_collectionviewrestriction.py b/wagtail/core/migrations/0039_collectionviewrestriction.py index 880e86149..2c2a1f2dc 100644 --- a/wagtail/core/migrations/0039_collectionviewrestriction.py +++ b/wagtail/core/migrations/0039_collectionviewrestriction.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2016-12-19 15:32 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/wagtail/core/migrations/0040_page_draft_title.py b/wagtail/core/migrations/0040_page_draft_title.py index c724ac586..00f5c8b71 100644 --- a/wagtail/core/migrations/0040_page_draft_title.py +++ b/wagtail/core/migrations/0040_page_draft_title.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.2 on 2017-01-20 15:34 -from __future__ import unicode_literals - from django.db import migrations, models from django.db.models import F diff --git a/wagtail/core/models.py b/wagtail/core/models.py index 402a1b674..2d79d055f 100644 --- a/wagtail/core/models.py +++ b/wagtail/core/models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import json import logging from collections import defaultdict diff --git a/wagtail/core/permission_policies/base.py b/wagtail/core/permission_policies/base.py index 465b335d1..564660de6 100644 --- a/wagtail/core/permission_policies/base.py +++ b/wagtail/core/permission_policies/base.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 Permission from django.contrib.contenttypes.models import ContentType diff --git a/wagtail/core/permission_policies/collections.py b/wagtail/core/permission_policies/collections.py index f0590b827..a49caea0a 100644 --- a/wagtail/core/permission_policies/collections.py +++ b/wagtail/core/permission_policies/collections.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.core.exceptions import FieldDoesNotExist, ImproperlyConfigured diff --git a/wagtail/core/permissions.py b/wagtail/core/permissions.py index 7af41f4c6..5ca00e7b6 100644 --- a/wagtail/core/permissions.py +++ b/wagtail/core/permissions.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from wagtail.core.models import Collection, Site from wagtail.core.permission_policies import ModelPermissionPolicy diff --git a/wagtail/core/query.py b/wagtail/core/query.py index 93e51501e..1fb3a71b4 100644 --- a/wagtail/core/query.py +++ b/wagtail/core/query.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import posixpath from collections import defaultdict diff --git a/wagtail/core/rich_text.py b/wagtail/core/rich_text.py index 65c95745b..941c94c48 100644 --- a/wagtail/core/rich_text.py +++ b/wagtail/core/rich_text.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import re # parsing HTML with regexes LIKE A BOSS. from django.utils.html import escape diff --git a/wagtail/core/signal_handlers.py b/wagtail/core/signal_handlers.py index dc187b135..8cd2e41c2 100644 --- a/wagtail/core/signal_handlers.py +++ b/wagtail/core/signal_handlers.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import logging from django.core.cache import cache diff --git a/wagtail/core/signals.py b/wagtail/core/signals.py index 4e3d87a51..2f3997ca0 100644 --- a/wagtail/core/signals.py +++ b/wagtail/core/signals.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.dispatch import Signal page_published = Signal(providing_args=['instance', 'revision']) diff --git a/wagtail/core/sites.py b/wagtail/core/sites.py index a26fcb8e1..7380a48f2 100644 --- a/wagtail/core/sites.py +++ b/wagtail/core/sites.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import apps from django.db.models import Case, IntegerField, Q, When diff --git a/wagtail/core/templatetags/wagtailcore_tags.py b/wagtail/core/templatetags/wagtailcore_tags.py index 45de60522..2fae945d2 100644 --- a/wagtail/core/templatetags/wagtailcore_tags.py +++ b/wagtail/core/templatetags/wagtailcore_tags.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django import template from django.template.defaulttags import token_kwargs from django.utils.encoding import force_text diff --git a/wagtail/core/tests/test_blocks.py b/wagtail/core/tests/test_blocks.py index 16dcb65eb..0ca15db90 100644 --- a/wagtail/core/tests/test_blocks.py +++ b/wagtail/core/tests/test_blocks.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -* -from __future__ import absolute_import, unicode_literals - import base64 import collections import json diff --git a/wagtail/core/tests/test_collection_model.py b/wagtail/core/tests/test_collection_model.py index b0e6bcbd6..657160d7e 100644 --- a/wagtail/core/tests/test_collection_model.py +++ b/wagtail/core/tests/test_collection_model.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.test import TestCase from wagtail.core.models import Collection diff --git a/wagtail/core/tests/test_collection_permission_policies.py b/wagtail/core/tests/test_collection_permission_policies.py index 2ecaccaee..781424f51 100644 --- a/wagtail/core/tests/test_collection_permission_policies.py +++ b/wagtail/core/tests/test_collection_permission_policies.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, Group, Permission from django.contrib.contenttypes.models import ContentType diff --git a/wagtail/core/tests/test_dbwhitelister.py b/wagtail/core/tests/test_dbwhitelister.py index 34b2236bd..a3c0aa1b8 100644 --- a/wagtail/core/tests/test_dbwhitelister.py +++ b/wagtail/core/tests/test_dbwhitelister.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from bs4 import BeautifulSoup from django.test import TestCase diff --git a/wagtail/core/tests/test_hooks.py b/wagtail/core/tests/test_hooks.py index 94b84ddba..41b707614 100644 --- a/wagtail/core/tests/test_hooks.py +++ b/wagtail/core/tests/test_hooks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.test import TestCase from wagtail.tests.utils import WagtailTestUtils diff --git a/wagtail/core/tests/test_jinja2.py b/wagtail/core/tests/test_jinja2.py index 2ac6c8536..0bb649ec1 100644 --- a/wagtail/core/tests/test_jinja2.py +++ b/wagtail/core/tests/test_jinja2.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.template import engines from django.template.loader import render_to_string from django.test import TestCase diff --git a/wagtail/core/tests/test_management_commands.py b/wagtail/core/tests/test_management_commands.py index b75429de9..457b9785c 100644 --- a/wagtail/core/tests/test_management_commands.py +++ b/wagtail/core/tests/test_management_commands.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from datetime import timedelta from io import StringIO diff --git a/wagtail/core/tests/test_migrations.py b/wagtail/core/tests/test_migrations.py index c16336c3d..262304825 100644 --- a/wagtail/core/tests/test_migrations.py +++ b/wagtail/core/tests/test_migrations.py @@ -3,8 +3,6 @@ Check that all changes to Wagtail models have had migrations created. If there are outstanding model changes that need migrations, fail the tests. """ -from __future__ import absolute_import, unicode_literals - from django.apps import apps from django.db.migrations.autodetector import MigrationAutodetector from django.db.migrations.loader import MigrationLoader diff --git a/wagtail/core/tests/test_page_model.py b/wagtail/core/tests/test_page_model.py index fa93e678a..9ce019f64 100644 --- a/wagtail/core/tests/test_page_model.py +++ b/wagtail/core/tests/test_page_model.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import datetime import json diff --git a/wagtail/core/tests/test_page_permissions.py b/wagtail/core/tests/test_page_permissions.py index f011c101c..4c19ed350 100644 --- a/wagtail/core/tests/test_page_permissions.py +++ b/wagtail/core/tests/test_page_permissions.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 from django.test import TestCase diff --git a/wagtail/core/tests/test_page_privacy.py b/wagtail/core/tests/test_page_privacy.py index 1b5403922..35e0a8537 100644 --- a/wagtail/core/tests/test_page_privacy.py +++ b/wagtail/core/tests/test_page_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 diff --git a/wagtail/core/tests/test_page_queryset.py b/wagtail/core/tests/test_page_queryset.py index 26baf6066..7157a0ea6 100644 --- a/wagtail/core/tests/test_page_queryset.py +++ b/wagtail/core/tests/test_page_queryset.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.contrib.contenttypes.models import ContentType from django.test import TestCase diff --git a/wagtail/core/tests/test_permission_policies.py b/wagtail/core/tests/test_permission_policies.py index 6c7a7906d..a2aa00030 100644 --- a/wagtail/core/tests/test_permission_policies.py +++ b/wagtail/core/tests/test_permission_policies.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, Group, Permission from django.contrib.contenttypes.models import ContentType diff --git a/wagtail/core/tests/test_rich_text.py b/wagtail/core/tests/test_rich_text.py index e8a420a76..cb8d6473b 100644 --- a/wagtail/core/tests/test_rich_text.py +++ b/wagtail/core/tests/test_rich_text.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from bs4 import BeautifulSoup from django.test import TestCase from mock import patch diff --git a/wagtail/core/tests/test_sites.py b/wagtail/core/tests/test_sites.py index 15bd1e6cb..860c251ea 100644 --- a/wagtail/core/tests/test_sites.py +++ b/wagtail/core/tests/test_sites.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.core.exceptions import ValidationError from django.http.request import HttpRequest from django.test import TestCase, override_settings diff --git a/wagtail/core/tests/test_streamfield.py b/wagtail/core/tests/test_streamfield.py index 49e3475d1..29d01a9e6 100644 --- a/wagtail/core/tests/test_streamfield.py +++ b/wagtail/core/tests/test_streamfield.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -* -from __future__ import absolute_import, unicode_literals - import json from django.apps import apps diff --git a/wagtail/core/tests/test_tests.py b/wagtail/core/tests/test_tests.py index b149faca0..4fb1c08f0 100644 --- a/wagtail/core/tests/test_tests.py +++ b/wagtail/core/tests/test_tests.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.test import TestCase from wagtail.tests.testapp.models import ( diff --git a/wagtail/core/tests/test_utils.py b/wagtail/core/tests/test_utils.py index aa10efe59..6a5736a03 100644 --- a/wagtail/core/tests/test_utils.py +++ b/wagtail/core/tests/test_utils.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -* -from __future__ import absolute_import, unicode_literals - from django.test import TestCase from django.utils.text import slugify diff --git a/wagtail/core/tests/test_views.py b/wagtail/core/tests/test_views.py index 25d23b8c8..b6e1df431 100644 --- a/wagtail/core/tests/test_views.py +++ b/wagtail/core/tests/test_views.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.test import TestCase from django.urls import reverse diff --git a/wagtail/core/tests/test_whitelist.py b/wagtail/core/tests/test_whitelist.py index dc803e927..eb7c60d43 100644 --- a/wagtail/core/tests/test_whitelist.py +++ b/wagtail/core/tests/test_whitelist.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from bs4 import BeautifulSoup from django.test import TestCase diff --git a/wagtail/core/tests/tests.py b/wagtail/core/tests/tests.py index 3f0678bcc..7804ddae1 100644 --- a/wagtail/core/tests/tests.py +++ b/wagtail/core/tests/tests.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django import template from django.core.cache import cache from django.http import HttpRequest diff --git a/wagtail/core/url_routing.py b/wagtail/core/url_routing.py index 035db3e89..678f403aa 100644 --- a/wagtail/core/url_routing.py +++ b/wagtail/core/url_routing.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - class RouteResult(object): """ diff --git a/wagtail/core/urls.py b/wagtail/core/urls.py index fddf473af..0105fdf36 100644 --- a/wagtail/core/urls.py +++ b/wagtail/core/urls.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf import settings from django.conf.urls import url from django.contrib.auth import views as auth_views diff --git a/wagtail/core/utils.py b/wagtail/core/utils.py index 4c94b8e7a..402020e6d 100644 --- a/wagtail/core/utils.py +++ b/wagtail/core/utils.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import inspect import re import unicodedata diff --git a/wagtail/core/views.py b/wagtail/core/views.py index dd77b4ef4..879f8b2c1 100644 --- a/wagtail/core/views.py +++ b/wagtail/core/views.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.http import Http404, HttpResponse from django.shortcuts import get_object_or_404, redirect from django.urls import reverse diff --git a/wagtail/core/wagtail_hooks.py b/wagtail/core/wagtail_hooks.py index 0d40a1f50..4dedf0d26 100644 --- a/wagtail/core/wagtail_hooks.py +++ b/wagtail/core/wagtail_hooks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf import settings from django.contrib.auth.views import redirect_to_login from django.urls import reverse diff --git a/wagtail/core/whitelist.py b/wagtail/core/whitelist.py index 5a517d9e5..4d7746446 100644 --- a/wagtail/core/whitelist.py +++ b/wagtail/core/whitelist.py @@ -2,8 +2,6 @@ A generic HTML whitelisting engine, designed to accommodate subclassing to override specific rules. """ -from __future__ import absolute_import, unicode_literals - import re from bs4 import BeautifulSoup, Comment, NavigableString, Tag diff --git a/wagtail/documents/admin.py b/wagtail/documents/admin.py index 76c454566..03f57d504 100644 --- a/wagtail/documents/admin.py +++ b/wagtail/documents/admin.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf import settings from django.contrib import admin diff --git a/wagtail/documents/admin_urls.py b/wagtail/documents/admin_urls.py index 0506c98d4..bc3edbda6 100644 --- a/wagtail/documents/admin_urls.py +++ b/wagtail/documents/admin_urls.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import url from wagtail.documents.views import chooser, documents, multiple diff --git a/wagtail/documents/api/admin/endpoints.py b/wagtail/documents/api/admin/endpoints.py index 07615e717..aac3bad99 100644 --- a/wagtail/documents/api/admin/endpoints.py +++ b/wagtail/documents/api/admin/endpoints.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from ..v2.endpoints import DocumentsAPIEndpoint diff --git a/wagtail/documents/api/v2/endpoints.py b/wagtail/documents/api/v2/endpoints.py index 486e37e25..8cad04321 100644 --- a/wagtail/documents/api/v2/endpoints.py +++ b/wagtail/documents/api/v2/endpoints.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from wagtail.api.v2.endpoints import BaseAPIEndpoint from wagtail.api.v2.filters import FieldsFilter, OrderingFilter, SearchFilter diff --git a/wagtail/documents/api/v2/serializers.py b/wagtail/documents/api/v2/serializers.py index 41a4cb08a..520084b9a 100644 --- a/wagtail/documents/api/v2/serializers.py +++ b/wagtail/documents/api/v2/serializers.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from rest_framework.fields import Field from wagtail.api.v2.serializers import BaseSerializer diff --git a/wagtail/documents/apps.py b/wagtail/documents/apps.py index 2ac258f4c..a48788924 100644 --- a/wagtail/documents/apps.py +++ b/wagtail/documents/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import AppConfig diff --git a/wagtail/documents/blocks.py b/wagtail/documents/blocks.py index 1739aa114..0e9578064 100644 --- a/wagtail/documents/blocks.py +++ b/wagtail/documents/blocks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.utils.functional import cached_property from django.utils.html import format_html diff --git a/wagtail/documents/edit_handlers.py b/wagtail/documents/edit_handlers.py index 852b05b6e..716b5dc24 100644 --- a/wagtail/documents/edit_handlers.py +++ b/wagtail/documents/edit_handlers.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from wagtail.admin.edit_handlers import BaseChooserPanel from .widgets import AdminDocumentChooser diff --git a/wagtail/documents/forms.py b/wagtail/documents/forms.py index 0cb10ac73..6012336d5 100644 --- a/wagtail/documents/forms.py +++ b/wagtail/documents/forms.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django import forms from django.forms.models import modelform_factory from django.utils.translation import ugettext_lazy as _ diff --git a/wagtail/documents/migrations/0001_initial.py b/wagtail/documents/migrations/0001_initial.py index 09e702e58..0a69776f1 100644 --- a/wagtail/documents/migrations/0001_initial.py +++ b/wagtail/documents/migrations/0001_initial.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - import taggit.managers from django.conf import settings from django.db import migrations, models diff --git a/wagtail/documents/migrations/0002_initial_data.py b/wagtail/documents/migrations/0002_initial_data.py index 7ab567ca4..36952803e 100644 --- a/wagtail/documents/migrations/0002_initial_data.py +++ b/wagtail/documents/migrations/0002_initial_data.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/wagtail/documents/migrations/0003_add_verbose_names.py b/wagtail/documents/migrations/0003_add_verbose_names.py index 0912c9b39..5a5d79f25 100644 --- a/wagtail/documents/migrations/0003_add_verbose_names.py +++ b/wagtail/documents/migrations/0003_add_verbose_names.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.conf import settings from django.db import migrations, models diff --git a/wagtail/documents/migrations/0004_capitalizeverbose.py b/wagtail/documents/migrations/0004_capitalizeverbose.py index 9c4aeae7f..6eab5a691 100644 --- a/wagtail/documents/migrations/0004_capitalizeverbose.py +++ b/wagtail/documents/migrations/0004_capitalizeverbose.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - import taggit.managers from django.conf import settings from django.db import migrations, models diff --git a/wagtail/documents/migrations/0005_alter_uploaded_by_user_on_delete_action.py b/wagtail/documents/migrations/0005_alter_uploaded_by_user_on_delete_action.py index 58ceaaf30..49a94fbec 100644 --- a/wagtail/documents/migrations/0005_alter_uploaded_by_user_on_delete_action.py +++ b/wagtail/documents/migrations/0005_alter_uploaded_by_user_on_delete_action.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9 on 2015-12-22 16:09 -from __future__ import unicode_literals - import django.db.models.deletion from django.conf import settings from django.db import migrations, models diff --git a/wagtail/documents/migrations/0005_document_collection.py b/wagtail/documents/migrations/0005_document_collection.py index 317d2d654..9f9f93450 100644 --- a/wagtail/documents/migrations/0005_document_collection.py +++ b/wagtail/documents/migrations/0005_document_collection.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models import wagtail.core.models diff --git a/wagtail/documents/migrations/0006_copy_document_permissions_to_collections.py b/wagtail/documents/migrations/0006_copy_document_permissions_to_collections.py index 56924fd0c..909be589d 100644 --- a/wagtail/documents/migrations/0006_copy_document_permissions_to_collections.py +++ b/wagtail/documents/migrations/0006_copy_document_permissions_to_collections.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/wagtail/documents/migrations/0007_merge.py b/wagtail/documents/migrations/0007_merge.py index d1af5a389..32195fac0 100644 --- a/wagtail/documents/migrations/0007_merge.py +++ b/wagtail/documents/migrations/0007_merge.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.1 on 2016-01-28 14:46 -from __future__ import unicode_literals - from django.db import migrations diff --git a/wagtail/documents/models.py b/wagtail/documents/models.py index f66fc570e..b9af1f26a 100644 --- a/wagtail/documents/models.py +++ b/wagtail/documents/models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import os.path from django.conf import settings diff --git a/wagtail/documents/permissions.py b/wagtail/documents/permissions.py index 34cffaad9..1bbc97e43 100644 --- a/wagtail/documents/permissions.py +++ b/wagtail/documents/permissions.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from wagtail.core.permission_policies.collections import CollectionOwnershipPermissionPolicy from wagtail.documents.models import Document, get_document_model diff --git a/wagtail/documents/rich_text.py b/wagtail/documents/rich_text.py index 1a9f86243..5d4a329da 100644 --- a/wagtail/documents/rich_text.py +++ b/wagtail/documents/rich_text.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.utils.html import escape from wagtail.documents.models import get_document_model diff --git a/wagtail/documents/signal_handlers.py b/wagtail/documents/signal_handlers.py index a3d54a90b..f90850292 100644 --- a/wagtail/documents/signal_handlers.py +++ b/wagtail/documents/signal_handlers.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.db import transaction from django.db.models.signals import post_delete diff --git a/wagtail/documents/tests/test_admin_views.py b/wagtail/documents/tests/test_admin_views.py index c38bd9cc4..315819430 100644 --- a/wagtail/documents/tests/test_admin_views.py +++ b/wagtail/documents/tests/test_admin_views.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import json from django.contrib.auth import get_user_model diff --git a/wagtail/documents/tests/test_collection_privacy.py b/wagtail/documents/tests/test_collection_privacy.py index 811971b7a..6e8fbc1ed 100644 --- a/wagtail/documents/tests/test_collection_privacy.py +++ b/wagtail/documents/tests/test_collection_privacy.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.contrib.auth.models import Group from django.core.files.base import ContentFile from django.test import TestCase diff --git a/wagtail/documents/tests/test_models.py b/wagtail/documents/tests/test_models.py index 2a6f0937d..5e4b1cdf6 100644 --- a/wagtail/documents/tests/test_models.py +++ b/wagtail/documents/tests/test_models.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.core.files.base import ContentFile diff --git a/wagtail/documents/tests/test_rich_text.py b/wagtail/documents/tests/test_rich_text.py index 23ba00ffe..609fa139b 100644 --- a/wagtail/documents/tests/test_rich_text.py +++ b/wagtail/documents/tests/test_rich_text.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from bs4 import BeautifulSoup from django.test import TestCase diff --git a/wagtail/documents/tests/test_search.py b/wagtail/documents/tests/test_search.py index 43c32e8b1..4d26cfc1e 100644 --- a/wagtail/documents/tests/test_search.py +++ b/wagtail/documents/tests/test_search.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import unittest from django.core.files.base import ContentFile diff --git a/wagtail/documents/tests/test_views.py b/wagtail/documents/tests/test_views.py index 4d79ab423..751000865 100644 --- a/wagtail/documents/tests/test_views.py +++ b/wagtail/documents/tests/test_views.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import os.path import unittest diff --git a/wagtail/documents/urls.py b/wagtail/documents/urls.py index 1f3df6ca2..88f106fbf 100644 --- a/wagtail/documents/urls.py +++ b/wagtail/documents/urls.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import url from wagtail.documents.views import serve diff --git a/wagtail/documents/views/chooser.py b/wagtail/documents/views/chooser.py index bfd9202fc..8ec47063b 100644 --- a/wagtail/documents/views/chooser.py +++ b/wagtail/documents/views/chooser.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import json from django.shortcuts import get_object_or_404, render diff --git a/wagtail/documents/views/documents.py b/wagtail/documents/views/documents.py index 85e71b5ed..0ce03f6ce 100644 --- a/wagtail/documents/views/documents.py +++ b/wagtail/documents/views/documents.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse from django.utils.translation import ugettext as _ diff --git a/wagtail/documents/views/multiple.py b/wagtail/documents/views/multiple.py index 0eab55ae3..e1621990d 100644 --- a/wagtail/documents/views/multiple.py +++ b/wagtail/documents/views/multiple.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.core.exceptions import PermissionDenied from django.http import HttpResponseBadRequest, JsonResponse from django.shortcuts import get_object_or_404, render diff --git a/wagtail/documents/views/serve.py b/wagtail/documents/views/serve.py index 70756aa49..b68fe5224 100644 --- a/wagtail/documents/views/serve.py +++ b/wagtail/documents/views/serve.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from wsgiref.util import FileWrapper from django.conf import settings diff --git a/wagtail/documents/wagtail_hooks.py b/wagtail/documents/wagtail_hooks.py index 1711de62e..cbe67e2bc 100644 --- a/wagtail/documents/wagtail_hooks.py +++ b/wagtail/documents/wagtail_hooks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf import settings from django.conf.urls import include, url from django.contrib.staticfiles.templatetags.staticfiles import static diff --git a/wagtail/documents/widgets.py b/wagtail/documents/widgets.py index c381083cc..da8c675ae 100644 --- a/wagtail/documents/widgets.py +++ b/wagtail/documents/widgets.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import json from django.template.loader import render_to_string diff --git a/wagtail/embeds/apps.py b/wagtail/embeds/apps.py index 03ef9d362..c320eaaa3 100644 --- a/wagtail/embeds/apps.py +++ b/wagtail/embeds/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import AppConfig from .finders import get_finders diff --git a/wagtail/embeds/blocks.py b/wagtail/embeds/blocks.py index 80a5ee97d..848fd3e44 100644 --- a/wagtail/embeds/blocks.py +++ b/wagtail/embeds/blocks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from wagtail.core import blocks from wagtail.embeds.format import embed_to_frontend_html diff --git a/wagtail/embeds/embeds.py b/wagtail/embeds/embeds.py index 62f43d363..bfaaac676 100644 --- a/wagtail/embeds/embeds.py +++ b/wagtail/embeds/embeds.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from datetime import datetime from .exceptions import EmbedUnsupportedProviderException diff --git a/wagtail/embeds/exceptions.py b/wagtail/embeds/exceptions.py index 831b0bd37..0adc84f53 100644 --- a/wagtail/embeds/exceptions.py +++ b/wagtail/embeds/exceptions.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - class EmbedException(Exception): pass diff --git a/wagtail/embeds/finders/base.py b/wagtail/embeds/finders/base.py index 5b028d94d..9ea9e2bcf 100644 --- a/wagtail/embeds/finders/base.py +++ b/wagtail/embeds/finders/base.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - class EmbedFinder(object): def accept(self, url): diff --git a/wagtail/embeds/finders/embedly.py b/wagtail/embeds/finders/embedly.py index a750cf22c..9fbf9e64e 100644 --- a/wagtail/embeds/finders/embedly.py +++ b/wagtail/embeds/finders/embedly.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from wagtail.embeds.exceptions import EmbedException, EmbedNotFoundException from .base import EmbedFinder diff --git a/wagtail/embeds/finders/oembed.py b/wagtail/embeds/finders/oembed.py index 90062224a..7d5d273ed 100644 --- a/wagtail/embeds/finders/oembed.py +++ b/wagtail/embeds/finders/oembed.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import json import re diff --git a/wagtail/embeds/format.py b/wagtail/embeds/format.py index 9ac6c5695..961f545b7 100644 --- a/wagtail/embeds/format.py +++ b/wagtail/embeds/format.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.template.loader import render_to_string from wagtail.embeds import embeds diff --git a/wagtail/embeds/forms.py b/wagtail/embeds/forms.py index edbc98c44..7c45c0bcc 100644 --- a/wagtail/embeds/forms.py +++ b/wagtail/embeds/forms.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django import forms from django.core.exceptions import ValidationError from django.core.validators import URLValidator diff --git a/wagtail/embeds/migrations/0001_initial.py b/wagtail/embeds/migrations/0001_initial.py index c1600764c..3d904b10b 100644 --- a/wagtail/embeds/migrations/0001_initial.py +++ b/wagtail/embeds/migrations/0001_initial.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/embeds/migrations/0002_add_verbose_names.py b/wagtail/embeds/migrations/0002_add_verbose_names.py index 78a5794d5..b8a1e7d57 100644 --- a/wagtail/embeds/migrations/0002_add_verbose_names.py +++ b/wagtail/embeds/migrations/0002_add_verbose_names.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/wagtail/embeds/migrations/0003_capitalizeverbose.py b/wagtail/embeds/migrations/0003_capitalizeverbose.py index c1fe85eb8..d34467089 100644 --- a/wagtail/embeds/migrations/0003_capitalizeverbose.py +++ b/wagtail/embeds/migrations/0003_capitalizeverbose.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/wagtail/embeds/models.py b/wagtail/embeds/models.py index 4545d37a9..215a66e4b 100644 --- a/wagtail/embeds/models.py +++ b/wagtail/embeds/models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, unicode_literals - from django.db import models from django.utils.translation import ugettext_lazy as _ diff --git a/wagtail/embeds/oembed_providers.py b/wagtail/embeds/oembed_providers.py index 494363b94..c9fcb6e08 100644 --- a/wagtail/embeds/oembed_providers.py +++ b/wagtail/embeds/oembed_providers.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - speakerdeck = { "endpoint": "https://speakerdeck.com/oembed.{format}", "urls": [ diff --git a/wagtail/embeds/rich_text.py b/wagtail/embeds/rich_text.py index ed18b9ecf..2b93bc843 100644 --- a/wagtail/embeds/rich_text.py +++ b/wagtail/embeds/rich_text.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from wagtail.embeds import format from wagtail.embeds.exceptions import EmbedException diff --git a/wagtail/embeds/templatetags/wagtailembeds_tags.py b/wagtail/embeds/templatetags/wagtailembeds_tags.py index 7454d1af2..1a1d01504 100644 --- a/wagtail/embeds/templatetags/wagtailembeds_tags.py +++ b/wagtail/embeds/templatetags/wagtailembeds_tags.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django import template from django.utils.safestring import mark_safe diff --git a/wagtail/embeds/tests.py b/wagtail/embeds/tests.py index 3abbc26de..d44e24158 100644 --- a/wagtail/embeds/tests.py +++ b/wagtail/embeds/tests.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, unicode_literals - import unittest import urllib.request from urllib.error import URLError diff --git a/wagtail/embeds/urls.py b/wagtail/embeds/urls.py index 16a64ab83..bd65ba78d 100644 --- a/wagtail/embeds/urls.py +++ b/wagtail/embeds/urls.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import url from wagtail.embeds.views import chooser diff --git a/wagtail/embeds/views/chooser.py b/wagtail/embeds/views/chooser.py index 631f01ddf..64fe8bb39 100644 --- a/wagtail/embeds/views/chooser.py +++ b/wagtail/embeds/views/chooser.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.forms.utils import ErrorList from django.utils.translation import ugettext as _ diff --git a/wagtail/embeds/wagtail_hooks.py b/wagtail/embeds/wagtail_hooks.py index 021e1a963..4d54fdd41 100644 --- a/wagtail/embeds/wagtail_hooks.py +++ b/wagtail/embeds/wagtail_hooks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import include, url from django.urls import reverse from django.utils.html import format_html diff --git a/wagtail/images/__init__.py b/wagtail/images/__init__.py index fc31ca059..50a312812 100644 --- a/wagtail/images/__init__.py +++ b/wagtail/images/__init__.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf import settings from django.core.exceptions import ImproperlyConfigured diff --git a/wagtail/images/admin.py b/wagtail/images/admin.py index 37233dd3a..ef1d4964e 100644 --- a/wagtail/images/admin.py +++ b/wagtail/images/admin.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf import settings from django.contrib import admin diff --git a/wagtail/images/admin_urls.py b/wagtail/images/admin_urls.py index 3ef3ca716..c2cb471d3 100644 --- a/wagtail/images/admin_urls.py +++ b/wagtail/images/admin_urls.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import url from wagtail.images.views import chooser, images, multiple diff --git a/wagtail/images/api/admin/endpoints.py b/wagtail/images/api/admin/endpoints.py index e11910594..53a84a0ea 100644 --- a/wagtail/images/api/admin/endpoints.py +++ b/wagtail/images/api/admin/endpoints.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from ..v2.endpoints import ImagesAPIEndpoint from .serializers import AdminImageSerializer diff --git a/wagtail/images/api/admin/serializers.py b/wagtail/images/api/admin/serializers.py index db2f1dfc6..aa399308b 100644 --- a/wagtail/images/api/admin/serializers.py +++ b/wagtail/images/api/admin/serializers.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from ..fields import ImageRenditionField from ..v2.serializers import ImageSerializer diff --git a/wagtail/images/api/fields.py b/wagtail/images/api/fields.py index 6eb3d7925..5f3404a8f 100644 --- a/wagtail/images/api/fields.py +++ b/wagtail/images/api/fields.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from collections import OrderedDict from rest_framework.fields import Field diff --git a/wagtail/images/api/v2/endpoints.py b/wagtail/images/api/v2/endpoints.py index 18029a51d..c4e4deb40 100644 --- a/wagtail/images/api/v2/endpoints.py +++ b/wagtail/images/api/v2/endpoints.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from wagtail.api.v2.endpoints import BaseAPIEndpoint from wagtail.api.v2.filters import FieldsFilter, OrderingFilter, SearchFilter diff --git a/wagtail/images/api/v2/serializers.py b/wagtail/images/api/v2/serializers.py index 046834626..9ec7b0ce4 100644 --- a/wagtail/images/api/v2/serializers.py +++ b/wagtail/images/api/v2/serializers.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from wagtail.api.v2.serializers import BaseSerializer diff --git a/wagtail/images/apps.py b/wagtail/images/apps.py index 31896d4d6..e71979633 100644 --- a/wagtail/images/apps.py +++ b/wagtail/images/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import AppConfig from . import checks # NOQA diff --git a/wagtail/images/blocks.py b/wagtail/images/blocks.py index db647c280..07c41a453 100644 --- a/wagtail/images/blocks.py +++ b/wagtail/images/blocks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.utils.functional import cached_property from wagtail.core.blocks import ChooserBlock diff --git a/wagtail/images/checks.py b/wagtail/images/checks.py index df6edb42d..b463af38c 100644 --- a/wagtail/images/checks.py +++ b/wagtail/images/checks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import os from django.core.checks import Warning, register diff --git a/wagtail/images/edit_handlers.py b/wagtail/images/edit_handlers.py index dd89c7ed3..4ce85dcd9 100644 --- a/wagtail/images/edit_handlers.py +++ b/wagtail/images/edit_handlers.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.template.loader import render_to_string from wagtail.admin.compare import ForeignObjectComparison diff --git a/wagtail/images/exceptions.py b/wagtail/images/exceptions.py index fa90907dd..3ed02f121 100644 --- a/wagtail/images/exceptions.py +++ b/wagtail/images/exceptions.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - class InvalidFilterSpecError(ValueError): pass diff --git a/wagtail/images/fields.py b/wagtail/images/fields.py index b5764a865..55295eea7 100644 --- a/wagtail/images/fields.py +++ b/wagtail/images/fields.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import os from django.conf import settings diff --git a/wagtail/images/formats.py b/wagtail/images/formats.py index f453c1262..4df4d7db1 100644 --- a/wagtail/images/formats.py +++ b/wagtail/images/formats.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.utils.html import escape from django.utils.translation import ugettext_lazy as _ diff --git a/wagtail/images/forms.py b/wagtail/images/forms.py index af1f044c4..c1aa26bf5 100644 --- a/wagtail/images/forms.py +++ b/wagtail/images/forms.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django import forms from django.forms.models import modelform_factory from django.utils.text import capfirst diff --git a/wagtail/images/image_operations.py b/wagtail/images/image_operations.py index 5ca436966..5174262e9 100644 --- a/wagtail/images/image_operations.py +++ b/wagtail/images/image_operations.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, unicode_literals - import inspect from wagtail.images.exceptions import InvalidFilterSpecError diff --git a/wagtail/images/jinja2tags.py b/wagtail/images/jinja2tags.py index 442d70828..dfe2bb054 100644 --- a/wagtail/images/jinja2tags.py +++ b/wagtail/images/jinja2tags.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from jinja2.ext import Extension from .shortcuts import get_rendition_or_not_found diff --git a/wagtail/images/migrations/0001_initial.py b/wagtail/images/migrations/0001_initial.py index 74eeb4dc0..41c148a7f 100644 --- a/wagtail/images/migrations/0001_initial.py +++ b/wagtail/images/migrations/0001_initial.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - import taggit.managers from django.conf import settings from django.db import migrations, models diff --git a/wagtail/images/migrations/0002_initial_data.py b/wagtail/images/migrations/0002_initial_data.py index a4a8c9b99..01f9bd048 100644 --- a/wagtail/images/migrations/0002_initial_data.py +++ b/wagtail/images/migrations/0002_initial_data.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/wagtail/images/migrations/0003_fix_focal_point_fields.py b/wagtail/images/migrations/0003_fix_focal_point_fields.py index dd63f4eec..b2b1a5c46 100644 --- a/wagtail/images/migrations/0003_fix_focal_point_fields.py +++ b/wagtail/images/migrations/0003_fix_focal_point_fields.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/images/migrations/0004_make_focal_point_key_not_nullable.py b/wagtail/images/migrations/0004_make_focal_point_key_not_nullable.py index 8ee4c67f9..52e2d0f86 100644 --- a/wagtail/images/migrations/0004_make_focal_point_key_not_nullable.py +++ b/wagtail/images/migrations/0004_make_focal_point_key_not_nullable.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/images/migrations/0005_make_filter_spec_unique.py b/wagtail/images/migrations/0005_make_filter_spec_unique.py index 8982a254b..dc96b3301 100644 --- a/wagtail/images/migrations/0005_make_filter_spec_unique.py +++ b/wagtail/images/migrations/0005_make_filter_spec_unique.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/images/migrations/0006_add_verbose_names.py b/wagtail/images/migrations/0006_add_verbose_names.py index 27299b28f..0926dc1b5 100644 --- a/wagtail/images/migrations/0006_add_verbose_names.py +++ b/wagtail/images/migrations/0006_add_verbose_names.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.conf import settings from django.db import migrations, models diff --git a/wagtail/images/migrations/0007_image_file_size.py b/wagtail/images/migrations/0007_image_file_size.py index 9dadb7a88..94a2dda3f 100644 --- a/wagtail/images/migrations/0007_image_file_size.py +++ b/wagtail/images/migrations/0007_image_file_size.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/images/migrations/0008_image_created_at_index.py b/wagtail/images/migrations/0008_image_created_at_index.py index a6a969020..30705ca6d 100644 --- a/wagtail/images/migrations/0008_image_created_at_index.py +++ b/wagtail/images/migrations/0008_image_created_at_index.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/images/migrations/0009_capitalizeverbose.py b/wagtail/images/migrations/0009_capitalizeverbose.py index 3f4772e14..6bd5f36bc 100644 --- a/wagtail/images/migrations/0009_capitalizeverbose.py +++ b/wagtail/images/migrations/0009_capitalizeverbose.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - import taggit.managers from django.conf import settings from django.db import migrations, models diff --git a/wagtail/images/migrations/0010_change_on_delete_behaviour.py b/wagtail/images/migrations/0010_change_on_delete_behaviour.py index 715711a7c..6039b8d21 100644 --- a/wagtail/images/migrations/0010_change_on_delete_behaviour.py +++ b/wagtail/images/migrations/0010_change_on_delete_behaviour.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - import django.db.models.deletion from django.conf import settings from django.db import migrations, models diff --git a/wagtail/images/migrations/0011_image_collection.py b/wagtail/images/migrations/0011_image_collection.py index 719c9fdea..b540f00eb 100644 --- a/wagtail/images/migrations/0011_image_collection.py +++ b/wagtail/images/migrations/0011_image_collection.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models import wagtail.core.models diff --git a/wagtail/images/migrations/0012_copy_image_permissions_to_collections.py b/wagtail/images/migrations/0012_copy_image_permissions_to_collections.py index 9d51a62e6..d3b86382b 100644 --- a/wagtail/images/migrations/0012_copy_image_permissions_to_collections.py +++ b/wagtail/images/migrations/0012_copy_image_permissions_to_collections.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/wagtail/images/migrations/0013_make_rendition_upload_callable.py b/wagtail/images/migrations/0013_make_rendition_upload_callable.py index 803acf7d6..4de25a881 100644 --- a/wagtail/images/migrations/0013_make_rendition_upload_callable.py +++ b/wagtail/images/migrations/0013_make_rendition_upload_callable.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import models, migrations import wagtail.images.models diff --git a/wagtail/images/migrations/0014_add_filter_spec_field.py b/wagtail/images/migrations/0014_add_filter_spec_field.py index 5e9582099..69cfa6e2a 100644 --- a/wagtail/images/migrations/0014_add_filter_spec_field.py +++ b/wagtail/images/migrations/0014_add_filter_spec_field.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10 on 2016-08-11 12:03 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/wagtail/images/migrations/0015_fill_filter_spec_field.py b/wagtail/images/migrations/0015_fill_filter_spec_field.py index 5531bd586..2c44989ef 100644 --- a/wagtail/images/migrations/0015_fill_filter_spec_field.py +++ b/wagtail/images/migrations/0015_fill_filter_spec_field.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10 on 2016-08-11 13:25 -from __future__ import unicode_literals - from django.db import migrations from wagtail.images.utils import get_fill_filter_spec_migrations diff --git a/wagtail/images/migrations/0016_deprecate_rendition_filter_relation.py b/wagtail/images/migrations/0016_deprecate_rendition_filter_relation.py index 2ff40f39f..eab01f6b0 100644 --- a/wagtail/images/migrations/0016_deprecate_rendition_filter_relation.py +++ b/wagtail/images/migrations/0016_deprecate_rendition_filter_relation.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.11 on 2016-11-11 17:04 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/images/migrations/0017_reduce_focal_point_key_max_length.py b/wagtail/images/migrations/0017_reduce_focal_point_key_max_length.py index b31d4c4bc..2f046cba1 100644 --- a/wagtail/images/migrations/0017_reduce_focal_point_key_max_length.py +++ b/wagtail/images/migrations/0017_reduce_focal_point_key_max_length.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/images/migrations/0018_remove_rendition_filter.py b/wagtail/images/migrations/0018_remove_rendition_filter.py index 2d248fc9b..006a833c7 100644 --- a/wagtail/images/migrations/0018_remove_rendition_filter.py +++ b/wagtail/images/migrations/0018_remove_rendition_filter.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2016-12-16 17:15 -from __future__ import unicode_literals - from django.db import migrations diff --git a/wagtail/images/migrations/0019_delete_filter.py b/wagtail/images/migrations/0019_delete_filter.py index a8d439988..d745a0c4a 100644 --- a/wagtail/images/migrations/0019_delete_filter.py +++ b/wagtail/images/migrations/0019_delete_filter.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.5 on 2017-02-08 23:51 -from __future__ import unicode_literals - from django.db import migrations diff --git a/wagtail/images/models.py b/wagtail/images/models.py index 1e37a0fc1..8f590c817 100644 --- a/wagtail/images/models.py +++ b/wagtail/images/models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import hashlib import os.path from collections import OrderedDict diff --git a/wagtail/images/permissions.py b/wagtail/images/permissions.py index 3485b4b52..c7b657bfd 100644 --- a/wagtail/images/permissions.py +++ b/wagtail/images/permissions.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from wagtail.core.permission_policies.collections import CollectionOwnershipPermissionPolicy from wagtail.images import get_image_model from wagtail.images.models import Image diff --git a/wagtail/images/rect.py b/wagtail/images/rect.py index 6f6389a94..31c31b7fc 100644 --- a/wagtail/images/rect.py +++ b/wagtail/images/rect.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, division, unicode_literals - import math diff --git a/wagtail/images/rich_text.py b/wagtail/images/rich_text.py index fb6cf60d8..bff4a22db 100644 --- a/wagtail/images/rich_text.py +++ b/wagtail/images/rich_text.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from wagtail.images import get_image_model from wagtail.images.formats import get_image_format diff --git a/wagtail/images/shortcuts.py b/wagtail/images/shortcuts.py index 9a334e484..e3c164fca 100644 --- a/wagtail/images/shortcuts.py +++ b/wagtail/images/shortcuts.py @@ -1,6 +1,3 @@ -# coding=utf-8 -from __future__ import absolute_import, unicode_literals - from wagtail.images.models import SourceImageIOError diff --git a/wagtail/images/signal_handlers.py b/wagtail/images/signal_handlers.py index a131b2f92..0a746cbe2 100644 --- a/wagtail/images/signal_handlers.py +++ b/wagtail/images/signal_handlers.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf import settings from django.db import transaction from django.db.models.signals import post_delete, pre_save diff --git a/wagtail/images/templatetags/wagtailimages_tags.py b/wagtail/images/templatetags/wagtailimages_tags.py index 39842aa56..92abbd57c 100644 --- a/wagtail/images/templatetags/wagtailimages_tags.py +++ b/wagtail/images/templatetags/wagtailimages_tags.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import re from django import template diff --git a/wagtail/images/tests/test_admin_views.py b/wagtail/images/tests/test_admin_views.py index f2c76cbb9..16499e2c1 100644 --- a/wagtail/images/tests/test_admin_views.py +++ b/wagtail/images/tests/test_admin_views.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import json from django.contrib.auth import get_user_model diff --git a/wagtail/images/tests/test_blocks.py b/wagtail/images/tests/test_blocks.py index 58d31f208..05d9e4770 100644 --- a/wagtail/images/tests/test_blocks.py +++ b/wagtail/images/tests/test_blocks.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -* -from __future__ import absolute_import, unicode_literals - import os from django.conf import settings diff --git a/wagtail/images/tests/test_image_operations.py b/wagtail/images/tests/test_image_operations.py index ff3688133..e390fda1c 100644 --- a/wagtail/images/tests/test_image_operations.py +++ b/wagtail/images/tests/test_image_operations.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from io import BytesIO from django.test import TestCase, override_settings diff --git a/wagtail/images/tests/test_jinja2.py b/wagtail/images/tests/test_jinja2.py index 40c828c8a..31c254220 100644 --- a/wagtail/images/tests/test_jinja2.py +++ b/wagtail/images/tests/test_jinja2.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import os from django.conf import settings diff --git a/wagtail/images/tests/test_models.py b/wagtail/images/tests/test_models.py index 9897d4dc2..576a1ab75 100644 --- a/wagtail/images/tests/test_models.py +++ b/wagtail/images/tests/test_models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import unittest from django.contrib.auth import get_user_model diff --git a/wagtail/images/tests/test_rich_text.py b/wagtail/images/tests/test_rich_text.py index b16b7fd04..f9d8d3d3e 100644 --- a/wagtail/images/tests/test_rich_text.py +++ b/wagtail/images/tests/test_rich_text.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from bs4 import BeautifulSoup from django.test import TestCase diff --git a/wagtail/images/tests/test_shortcuts.py b/wagtail/images/tests/test_shortcuts.py index 9ad7c13f8..dee202f23 100644 --- a/wagtail/images/tests/test_shortcuts.py +++ b/wagtail/images/tests/test_shortcuts.py @@ -1,6 +1,4 @@ # coding=utf-8 -from __future__ import absolute_import, unicode_literals - from django.test import TestCase from wagtail.images.shortcuts import get_rendition_or_not_found diff --git a/wagtail/images/tests/test_signal_handlers.py b/wagtail/images/tests/test_signal_handlers.py index 8c2b6b967..14b7a6207 100644 --- a/wagtail/images/tests/test_signal_handlers.py +++ b/wagtail/images/tests/test_signal_handlers.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.db import transaction from django.test import TransactionTestCase, override_settings diff --git a/wagtail/images/tests/tests.py b/wagtail/images/tests/tests.py index cb5fc8fd3..d4a6f4794 100644 --- a/wagtail/images/tests/tests.py +++ b/wagtail/images/tests/tests.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import os import unittest diff --git a/wagtail/images/tests/urls.py b/wagtail/images/tests/urls.py index 006369404..d8c20151d 100644 --- a/wagtail/images/tests/urls.py +++ b/wagtail/images/tests/urls.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import url from wagtail.tests import dummy_sendfile_backend diff --git a/wagtail/images/tests/utils.py b/wagtail/images/tests/utils.py index d8279a049..fd29d3f8b 100644 --- a/wagtail/images/tests/utils.py +++ b/wagtail/images/tests/utils.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from io import BytesIO import PIL.Image diff --git a/wagtail/images/urls.py b/wagtail/images/urls.py index 31507e9e7..7011a2e80 100644 --- a/wagtail/images/urls.py +++ b/wagtail/images/urls.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import url from wagtail.images.views.serve import serve diff --git a/wagtail/images/utils.py b/wagtail/images/utils.py index 916100283..3b0416e8a 100644 --- a/wagtail/images/utils.py +++ b/wagtail/images/utils.py @@ -1,9 +1,7 @@ -from __future__ import absolute_import, unicode_literals - - # Helper functions for migrating the Rendition.filter foreign key to the filter_spec field, # and the corresponding reverse migration + def get_fill_filter_spec_migrations(app_name, rendition_model_name): def fill_filter_spec_forward(apps, schema_editor): diff --git a/wagtail/images/views/chooser.py b/wagtail/images/views/chooser.py index ad6286b74..73a424828 100644 --- a/wagtail/images/views/chooser.py +++ b/wagtail/images/views/chooser.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import json from django.shortcuts import get_object_or_404, render diff --git a/wagtail/images/views/images.py b/wagtail/images/views/images.py index 5c5d381de..da7fe3ad0 100644 --- a/wagtail/images/views/images.py +++ b/wagtail/images/views/images.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import os from django.http import HttpResponse, JsonResponse diff --git a/wagtail/images/views/multiple.py b/wagtail/images/views/multiple.py index b54201de1..751449288 100644 --- a/wagtail/images/views/multiple.py +++ b/wagtail/images/views/multiple.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.core.exceptions import PermissionDenied from django.http import HttpResponseBadRequest, JsonResponse from django.shortcuts import get_object_or_404, render diff --git a/wagtail/images/views/serve.py b/wagtail/images/views/serve.py index 59077522c..49fd877f6 100644 --- a/wagtail/images/views/serve.py +++ b/wagtail/images/views/serve.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import base64 import hashlib import hmac diff --git a/wagtail/images/wagtail_hooks.py b/wagtail/images/wagtail_hooks.py index 052966865..d1329af3c 100644 --- a/wagtail/images/wagtail_hooks.py +++ b/wagtail/images/wagtail_hooks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import include, url from django.contrib.staticfiles.templatetags.staticfiles import static from django.urls import reverse diff --git a/wagtail/images/widgets.py b/wagtail/images/widgets.py index e941b8bd5..2ebf2ce3f 100644 --- a/wagtail/images/widgets.py +++ b/wagtail/images/widgets.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import json from django.template.loader import render_to_string diff --git a/wagtail/project_template/home/migrations/0001_initial.py b/wagtail/project_template/home/migrations/0001_initial.py index f75fb3119..ef46d1225 100644 --- a/wagtail/project_template/home/migrations/0001_initial.py +++ b/wagtail/project_template/home/migrations/0001_initial.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/project_template/home/migrations/0002_create_homepage.py b/wagtail/project_template/home/migrations/0002_create_homepage.py index f5948cdc0..039f0f572 100644 --- a/wagtail/project_template/home/migrations/0002_create_homepage.py +++ b/wagtail/project_template/home/migrations/0002_create_homepage.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/wagtail/project_template/home/models.py b/wagtail/project_template/home/models.py index ba5cd4d16..af7b579be 100644 --- a/wagtail/project_template/home/models.py +++ b/wagtail/project_template/home/models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.db import models from wagtail.core.models import Page diff --git a/wagtail/project_template/manage.py b/wagtail/project_template/manage.py index d5c36a9c0..fb92d87ee 100755 --- a/wagtail/project_template/manage.py +++ b/wagtail/project_template/manage.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -from __future__ import absolute_import, unicode_literals - import os import sys diff --git a/wagtail/project_template/project_name/settings/base.py b/wagtail/project_template/project_name/settings/base.py index 821712843..5453bba73 100644 --- a/wagtail/project_template/project_name/settings/base.py +++ b/wagtail/project_template/project_name/settings/base.py @@ -10,8 +10,6 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/{{ docs_version }}/ref/settings/ """ -from __future__ import absolute_import, unicode_literals - # Build paths inside the project like this: os.path.join(BASE_DIR, ...) import os diff --git a/wagtail/project_template/project_name/settings/dev.py b/wagtail/project_template/project_name/settings/dev.py index 6c23ef77a..5435169c1 100644 --- a/wagtail/project_template/project_name/settings/dev.py +++ b/wagtail/project_template/project_name/settings/dev.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from .base import * # SECURITY WARNING: don't run with debug turned on in production! diff --git a/wagtail/project_template/project_name/settings/production.py b/wagtail/project_template/project_name/settings/production.py index 801b445f7..9ca4ed752 100644 --- a/wagtail/project_template/project_name/settings/production.py +++ b/wagtail/project_template/project_name/settings/production.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from .base import * DEBUG = False diff --git a/wagtail/project_template/project_name/urls.py b/wagtail/project_template/project_name/urls.py index a4ab11bb1..053f09e8d 100644 --- a/wagtail/project_template/project_name/urls.py +++ b/wagtail/project_template/project_name/urls.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf import settings from django.conf.urls import include, url from django.contrib import admin diff --git a/wagtail/project_template/project_name/wsgi.py b/wagtail/project_template/project_name/wsgi.py index f58f6b154..8736b2ef3 100644 --- a/wagtail/project_template/project_name/wsgi.py +++ b/wagtail/project_template/project_name/wsgi.py @@ -7,8 +7,6 @@ For more information on this file, see https://docs.djangoproject.com/en/{{ docs_version }}/howto/deployment/wsgi/ """ -from __future__ import absolute_import, unicode_literals - import os from django.core.wsgi import get_wsgi_application diff --git a/wagtail/project_template/search/views.py b/wagtail/project_template/search/views.py index 78b163103..eeace7c25 100644 --- a/wagtail/project_template/search/views.py +++ b/wagtail/project_template/search/views.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator from django.shortcuts import render diff --git a/wagtail/search/apps.py b/wagtail/search/apps.py index 96260af5d..3ea706be0 100644 --- a/wagtail/search/apps.py +++ b/wagtail/search/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import AppConfig from wagtail.search.signal_handlers import register_signal_handlers diff --git a/wagtail/search/backends/base.py b/wagtail/search/backends/base.py index db385e319..e68c0daa2 100644 --- a/wagtail/search/backends/base.py +++ b/wagtail/search/backends/base.py @@ -1,6 +1,4 @@ -from __future__ import absolute_import, unicode_literals - from django.db.models.lookups import Lookup from django.db.models.query import QuerySet from django.db.models.sql.where import SubqueryConstraint, WhereNode diff --git a/wagtail/search/backends/db.py b/wagtail/search/backends/db.py index 1145d7ceb..d1d1e68b5 100644 --- a/wagtail/search/backends/db.py +++ b/wagtail/search/backends/db.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.db import models from django.db.models.expressions import Value diff --git a/wagtail/search/backends/elasticsearch2.py b/wagtail/search/backends/elasticsearch2.py index da8c12bde..5a392da36 100644 --- a/wagtail/search/backends/elasticsearch2.py +++ b/wagtail/search/backends/elasticsearch2.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import copy import json from urllib.parse import urlparse diff --git a/wagtail/search/backends/elasticsearch5.py b/wagtail/search/backends/elasticsearch5.py index 92e7be535..d8bf370b7 100644 --- a/wagtail/search/backends/elasticsearch5.py +++ b/wagtail/search/backends/elasticsearch5.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from .elasticsearch2 import ( Elasticsearch2Index, Elasticsearch2Mapping, Elasticsearch2SearchBackend, Elasticsearch2SearchQuery, Elasticsearch2SearchResults) diff --git a/wagtail/search/forms.py b/wagtail/search/forms.py index bea21cab1..0191e52b8 100644 --- a/wagtail/search/forms.py +++ b/wagtail/search/forms.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django import forms from django.utils.translation import ugettext_lazy as _ diff --git a/wagtail/search/index.py b/wagtail/search/index.py index a0dc9631c..4bb2cb4da 100644 --- a/wagtail/search/index.py +++ b/wagtail/search/index.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import inspect import logging diff --git a/wagtail/search/management/commands/search_garbage_collect.py b/wagtail/search/management/commands/search_garbage_collect.py index e9656db3d..453a70813 100644 --- a/wagtail/search/management/commands/search_garbage_collect.py +++ b/wagtail/search/management/commands/search_garbage_collect.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.core.management.base import BaseCommand from wagtail.search import models diff --git a/wagtail/search/management/commands/update_index.py b/wagtail/search/management/commands/update_index.py index 073dfe3a2..d52dc6521 100644 --- a/wagtail/search/management/commands/update_index.py +++ b/wagtail/search/management/commands/update_index.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import collections from django.conf import settings diff --git a/wagtail/search/migrations/0001_initial.py b/wagtail/search/migrations/0001_initial.py index cc06d2c73..40704c99c 100644 --- a/wagtail/search/migrations/0001_initial.py +++ b/wagtail/search/migrations/0001_initial.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/search/migrations/0002_add_verbose_names.py b/wagtail/search/migrations/0002_add_verbose_names.py index 0e359f14c..06fdeed91 100644 --- a/wagtail/search/migrations/0002_add_verbose_names.py +++ b/wagtail/search/migrations/0002_add_verbose_names.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/search/migrations/0003_remove_editors_pick.py b/wagtail/search/migrations/0003_remove_editors_pick.py index e8ac9f607..466d7506a 100644 --- a/wagtail/search/migrations/0003_remove_editors_pick.py +++ b/wagtail/search/migrations/0003_remove_editors_pick.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/wagtail/search/models.py b/wagtail/search/models.py index c0f32a883..04b7b980b 100644 --- a/wagtail/search/models.py +++ b/wagtail/search/models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import datetime from django.conf import settings diff --git a/wagtail/search/queryset.py b/wagtail/search/queryset.py index d5324623c..528c98b05 100644 --- a/wagtail/search/queryset.py +++ b/wagtail/search/queryset.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from wagtail.search.backends import get_search_backend diff --git a/wagtail/search/signal_handlers.py b/wagtail/search/signal_handlers.py index 6f5799c3c..75bb83a4a 100644 --- a/wagtail/search/signal_handlers.py +++ b/wagtail/search/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 wagtail.search import index diff --git a/wagtail/search/tests/elasticsearch_common_tests.py b/wagtail/search/tests/elasticsearch_common_tests.py index b4e63f7b7..d16473015 100644 --- a/wagtail/search/tests/elasticsearch_common_tests.py +++ b/wagtail/search/tests/elasticsearch_common_tests.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from datetime import date from io import StringIO diff --git a/wagtail/search/tests/test_backends.py b/wagtail/search/tests/test_backends.py index 9ce8c99f1..4dfb76dad 100644 --- a/wagtail/search/tests/test_backends.py +++ b/wagtail/search/tests/test_backends.py @@ -1,7 +1,5 @@ # coding: utf-8 -from __future__ import absolute_import, unicode_literals - import unittest from datetime import date from io import StringIO diff --git a/wagtail/search/tests/test_db_backend.py b/wagtail/search/tests/test_db_backend.py index 924c9bc80..7236fa368 100644 --- a/wagtail/search/tests/test_db_backend.py +++ b/wagtail/search/tests/test_db_backend.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import unittest from django.test import TestCase diff --git a/wagtail/search/tests/test_elasticsearch2_backend.py b/wagtail/search/tests/test_elasticsearch2_backend.py index 4c146e4a3..8fd6989b7 100644 --- a/wagtail/search/tests/test_elasticsearch2_backend.py +++ b/wagtail/search/tests/test_elasticsearch2_backend.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, unicode_literals - import datetime import json import unittest diff --git a/wagtail/search/tests/test_elasticsearch5_backend.py b/wagtail/search/tests/test_elasticsearch5_backend.py index f1a163fcf..4804d7818 100644 --- a/wagtail/search/tests/test_elasticsearch5_backend.py +++ b/wagtail/search/tests/test_elasticsearch5_backend.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, unicode_literals - import datetime import json import unittest diff --git a/wagtail/search/tests/test_frontend.py b/wagtail/search/tests/test_frontend.py index 75d67bdc8..11bab4332 100644 --- a/wagtail/search/tests/test_frontend.py +++ b/wagtail/search/tests/test_frontend.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.core import paginator from django.test import TestCase from django.urls import reverse diff --git a/wagtail/search/tests/test_index_functions.py b/wagtail/search/tests/test_index_functions.py index 875d4401c..af3e80c47 100644 --- a/wagtail/search/tests/test_index_functions.py +++ b/wagtail/search/tests/test_index_functions.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from datetime import date import mock diff --git a/wagtail/search/tests/test_indexed_class.py b/wagtail/search/tests/test_indexed_class.py index 41d977185..cee089b64 100644 --- a/wagtail/search/tests/test_indexed_class.py +++ b/wagtail/search/tests/test_indexed_class.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from contextlib import contextmanager from django.core import checks diff --git a/wagtail/search/tests/test_queries.py b/wagtail/search/tests/test_queries.py index f290bac3f..c9d621633 100644 --- a/wagtail/search/tests/test_queries.py +++ b/wagtail/search/tests/test_queries.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import datetime from io import StringIO diff --git a/wagtail/search/tests/test_related_fields.py b/wagtail/search/tests/test_related_fields.py index 6a012fc2d..e12bb0f14 100644 --- a/wagtail/search/tests/test_related_fields.py +++ b/wagtail/search/tests/test_related_fields.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.test import TestCase from wagtail.tests.search.models import Book, Novel diff --git a/wagtail/search/urls/admin.py b/wagtail/search/urls/admin.py index 7b82b0db6..63bee87f9 100644 --- a/wagtail/search/urls/admin.py +++ b/wagtail/search/urls/admin.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import url from wagtail.search.views import queries diff --git a/wagtail/search/urls/frontend.py b/wagtail/search/urls/frontend.py index 97883288c..ba7d802e4 100644 --- a/wagtail/search/urls/frontend.py +++ b/wagtail/search/urls/frontend.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import url from wagtail.search.views import search diff --git a/wagtail/search/utils.py b/wagtail/search/utils.py index 495a58833..01d428903 100644 --- a/wagtail/search/utils.py +++ b/wagtail/search/utils.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import re import string diff --git a/wagtail/search/views/frontend.py b/wagtail/search/views/frontend.py index c7ad1f245..1f771f0dc 100644 --- a/wagtail/search/views/frontend.py +++ b/wagtail/search/views/frontend.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf import settings from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator from django.http import JsonResponse diff --git a/wagtail/search/views/queries.py b/wagtail/search/views/queries.py index 8c52cc7c0..9a3d716ce 100644 --- a/wagtail/search/views/queries.py +++ b/wagtail/search/views/queries.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.shortcuts import render from wagtail.utils.pagination import paginate diff --git a/wagtail/search/wagtail_hooks.py b/wagtail/search/wagtail_hooks.py index 5d7dbccfc..a44fb8a37 100644 --- a/wagtail/search/wagtail_hooks.py +++ b/wagtail/search/wagtail_hooks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import include, url from wagtail.core import hooks diff --git a/wagtail/sites/forms.py b/wagtail/sites/forms.py index be7a3de25..c7044b898 100644 --- a/wagtail/sites/forms.py +++ b/wagtail/sites/forms.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django import forms from django.utils.translation import ugettext_lazy as _ diff --git a/wagtail/sites/tests.py b/wagtail/sites/tests.py index 0d1545eb0..5e6bf6102 100644 --- a/wagtail/sites/tests.py +++ b/wagtail/sites/tests.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 Permission from django.test import TestCase diff --git a/wagtail/sites/views.py b/wagtail/sites/views.py index b2bbf784e..37d4b7131 100644 --- a/wagtail/sites/views.py +++ b/wagtail/sites/views.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.utils.translation import ugettext_lazy from wagtail.admin.views import generic diff --git a/wagtail/sites/wagtail_hooks.py b/wagtail/sites/wagtail_hooks.py index 00ff9a892..52aa39b0c 100644 --- a/wagtail/sites/wagtail_hooks.py +++ b/wagtail/sites/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 _ diff --git a/wagtail/snippets/apps.py b/wagtail/snippets/apps.py index 24be4e975..4390eba25 100644 --- a/wagtail/snippets/apps.py +++ b/wagtail/snippets/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import AppConfig diff --git a/wagtail/snippets/blocks.py b/wagtail/snippets/blocks.py index 5a778642e..d8d690161 100644 --- a/wagtail/snippets/blocks.py +++ b/wagtail/snippets/blocks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.utils.functional import cached_property from wagtail.core.blocks import ChooserBlock diff --git a/wagtail/snippets/edit_handlers.py b/wagtail/snippets/edit_handlers.py index 146e07a26..1c0b92696 100644 --- a/wagtail/snippets/edit_handlers.py +++ b/wagtail/snippets/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 diff --git a/wagtail/snippets/models.py b/wagtail/snippets/models.py index 10a4bedd9..d221a1aae 100644 --- a/wagtail/snippets/models.py +++ b/wagtail/snippets/models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.urls import reverse from wagtail.admin.utils import get_object_usage diff --git a/wagtail/snippets/permissions.py b/wagtail/snippets/permissions.py index a1c0244bc..dbf8e07c0 100644 --- a/wagtail/snippets/permissions.py +++ b/wagtail/snippets/permissions.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.contrib.auth import get_permission_codename from wagtail.snippets.models import get_snippet_models diff --git a/wagtail/snippets/tests.py b/wagtail/snippets/tests.py index e8f43a56b..1889d57f2 100644 --- a/wagtail/snippets/tests.py +++ b/wagtail/snippets/tests.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 Permission from django.core.exceptions import ValidationError diff --git a/wagtail/snippets/urls.py b/wagtail/snippets/urls.py index 002ef6b26..066139658 100644 --- a/wagtail/snippets/urls.py +++ b/wagtail/snippets/urls.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import url from wagtail.snippets.views import chooser, snippets diff --git a/wagtail/snippets/views/chooser.py b/wagtail/snippets/views/chooser.py index 827b81c3f..fa872cd07 100644 --- a/wagtail/snippets/views/chooser.py +++ b/wagtail/snippets/views/chooser.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import json from django.shortcuts import get_object_or_404, render diff --git a/wagtail/snippets/views/snippets.py b/wagtail/snippets/views/snippets.py index a4f9650a9..8445ebfcf 100644 --- a/wagtail/snippets/views/snippets.py +++ b/wagtail/snippets/views/snippets.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import apps from django.http import Http404 from django.shortcuts import get_object_or_404, redirect, render diff --git a/wagtail/snippets/wagtail_hooks.py b/wagtail/snippets/wagtail_hooks.py index d06046e0e..148f3c04b 100644 --- a/wagtail/snippets/wagtail_hooks.py +++ b/wagtail/snippets/wagtail_hooks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import include, url from django.contrib.auth.models import Permission from django.contrib.contenttypes.models import ContentType diff --git a/wagtail/snippets/widgets.py b/wagtail/snippets/widgets.py index cd4d1a20b..6398f554d 100644 --- a/wagtail/snippets/widgets.py +++ b/wagtail/snippets/widgets.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import json from django.template.loader import render_to_string diff --git a/wagtail/tests/assert_logs.py b/wagtail/tests/assert_logs.py index 5153a8482..9da11a898 100644 --- a/wagtail/tests/assert_logs.py +++ b/wagtail/tests/assert_logs.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import logging from collections import namedtuple diff --git a/wagtail/tests/context_processors.py b/wagtail/tests/context_processors.py index 89d59682b..64810809a 100644 --- a/wagtail/tests/context_processors.py +++ b/wagtail/tests/context_processors.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - def do_not_use_static_url(request): def exception(): diff --git a/wagtail/tests/customuser/fields.py b/wagtail/tests/customuser/fields.py index 059b161b6..b1f2e3b78 100644 --- a/wagtail/tests/customuser/fields.py +++ b/wagtail/tests/customuser/fields.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import random from django.db import models diff --git a/wagtail/tests/customuser/migrations/0001_initial.py b/wagtail/tests/customuser/migrations/0001_initial.py index c641918e1..c0b63bec0 100644 --- a/wagtail/tests/customuser/migrations/0001_initial.py +++ b/wagtail/tests/customuser/migrations/0001_initial.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models from ..fields import ConvertedValueField diff --git a/wagtail/tests/customuser/migrations/0002_added_file_field.py b/wagtail/tests/customuser/migrations/0002_added_file_field.py index 1a6a27faa..f6dcc5305 100644 --- a/wagtail/tests/customuser/migrations/0002_added_file_field.py +++ b/wagtail/tests/customuser/migrations/0002_added_file_field.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/tests/customuser/models.py b/wagtail/tests/customuser/models.py index 0c5049de1..cc3fcb2ba 100644 --- a/wagtail/tests/customuser/models.py +++ b/wagtail/tests/customuser/models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import sys from django.contrib.auth.models import ( diff --git a/wagtail/tests/customuser/tests.py b/wagtail/tests/customuser/tests.py index fdc0ec74b..be2e384ef 100644 --- a/wagtail/tests/customuser/tests.py +++ b/wagtail/tests/customuser/tests.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import json from django.db import connections diff --git a/wagtail/tests/demosite/migrations/0001_initial.py b/wagtail/tests/demosite/migrations/0001_initial.py index b69b41593..720837a61 100644 --- a/wagtail/tests/demosite/migrations/0001_initial.py +++ b/wagtail/tests/demosite/migrations/0001_initial.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - import django.db.models.deletion import modelcluster.contrib.taggit import modelcluster.fields diff --git a/wagtail/tests/demosite/migrations/0002_capitalizeverbose.py b/wagtail/tests/demosite/migrations/0002_capitalizeverbose.py index 90b8600f0..b755c5103 100644 --- a/wagtail/tests/demosite/migrations/0002_capitalizeverbose.py +++ b/wagtail/tests/demosite/migrations/0002_capitalizeverbose.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/wagtail/tests/demosite/models.py b/wagtail/tests/demosite/models.py index a38405dc7..5e9c9eb18 100644 --- a/wagtail/tests/demosite/models.py +++ b/wagtail/tests/demosite/models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from datetime import date from django.db import models diff --git a/wagtail/tests/dummy_external_storage.py b/wagtail/tests/dummy_external_storage.py index 9d99ee995..11bbc9365 100644 --- a/wagtail/tests/dummy_external_storage.py +++ b/wagtail/tests/dummy_external_storage.py @@ -5,8 +5,6 @@ # - Calling .path on the storage or image file raises NotImplementedError # - File.open() after the file has been closed raises an error -from __future__ import absolute_import, unicode_literals - from django.core.files.base import File from django.core.files.storage import FileSystemStorage, Storage from django.utils.deconstruct import deconstructible diff --git a/wagtail/tests/dummy_sendfile_backend.py b/wagtail/tests/dummy_sendfile_backend.py index ea9861559..649357602 100644 --- a/wagtail/tests/dummy_sendfile_backend.py +++ b/wagtail/tests/dummy_sendfile_backend.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.http import HttpResponse diff --git a/wagtail/tests/modeladmintest/apps.py b/wagtail/tests/modeladmintest/apps.py index 215309a1b..7267f79cc 100644 --- a/wagtail/tests/modeladmintest/apps.py +++ b/wagtail/tests/modeladmintest/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import AppConfig diff --git a/wagtail/tests/modeladmintest/forms.py b/wagtail/tests/modeladmintest/forms.py index 9cb047061..e1a1310d8 100644 --- a/wagtail/tests/modeladmintest/forms.py +++ b/wagtail/tests/modeladmintest/forms.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django import forms from .models import Publisher diff --git a/wagtail/tests/modeladmintest/migrations/0001_initial.py b/wagtail/tests/modeladmintest/migrations/0001_initial.py index 75276841c..b904fe461 100644 --- a/wagtail/tests/modeladmintest/migrations/0001_initial.py +++ b/wagtail/tests/modeladmintest/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9 on 2015-12-22 11:40 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion import wagtail.search.index diff --git a/wagtail/tests/modeladmintest/migrations/0002_token.py b/wagtail/tests/modeladmintest/migrations/0002_token.py index bf829f0c5..cf5af501d 100644 --- a/wagtail/tests/modeladmintest/migrations/0002_token.py +++ b/wagtail/tests/modeladmintest/migrations/0002_token.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-06-07 11:22 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/tests/modeladmintest/migrations/0003_publisher.py b/wagtail/tests/modeladmintest/migrations/0003_publisher.py index fdb10f2a0..2e0e808bf 100644 --- a/wagtail/tests/modeladmintest/migrations/0003_publisher.py +++ b/wagtail/tests/modeladmintest/migrations/0003_publisher.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-06-07 11:22 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/tests/modeladmintest/migrations/0004_venuepage.py b/wagtail/tests/modeladmintest/migrations/0004_venuepage.py index 97193bcad..692dd19cd 100644 --- a/wagtail/tests/modeladmintest/migrations/0004_venuepage.py +++ b/wagtail/tests/modeladmintest/migrations/0004_venuepage.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-06-07 11:22 -from __future__ import unicode_literals - import django.db.models.deletion from django.db import migrations, models diff --git a/wagtail/tests/modeladmintest/migrations/0005_book_cover_image.py b/wagtail/tests/modeladmintest/migrations/0005_book_cover_image.py index ae789806c..ec59f22ea 100644 --- a/wagtail/tests/modeladmintest/migrations/0005_book_cover_image.py +++ b/wagtail/tests/modeladmintest/migrations/0005_book_cover_image.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.11 on 2016-11-14 20:12 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/wagtail/tests/modeladmintest/models.py b/wagtail/tests/modeladmintest/models.py index aa6ab39c4..1817cfc01 100644 --- a/wagtail/tests/modeladmintest/models.py +++ b/wagtail/tests/modeladmintest/models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.db import models from wagtail.core.models import Page diff --git a/wagtail/tests/modeladmintest/wagtail_hooks.py b/wagtail/tests/modeladmintest/wagtail_hooks.py index 569189224..118b15173 100644 --- a/wagtail/tests/modeladmintest/wagtail_hooks.py +++ b/wagtail/tests/modeladmintest/wagtail_hooks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from wagtail.contrib.modeladmin.options import ( ModelAdmin, ModelAdminGroup, ThumbnailMixin, modeladmin_register) from wagtail.contrib.modeladmin.views import CreateView diff --git a/wagtail/tests/non_root_urls.py b/wagtail/tests/non_root_urls.py index 340a3e447..20608c172 100644 --- a/wagtail/tests/non_root_urls.py +++ b/wagtail/tests/non_root_urls.py @@ -1,8 +1,6 @@ """An alternative urlconf module where Wagtail front-end URLs are rooted at '/site/' rather than '/'""" -from __future__ import absolute_import, unicode_literals - from django.conf.urls import include, url from wagtail.admin import urls as wagtailadmin_urls diff --git a/wagtail/tests/routablepage/apps.py b/wagtail/tests/routablepage/apps.py index 502056f4a..8a9f69be8 100644 --- a/wagtail/tests/routablepage/apps.py +++ b/wagtail/tests/routablepage/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import AppConfig diff --git a/wagtail/tests/routablepage/migrations/0001_initial.py b/wagtail/tests/routablepage/migrations/0001_initial.py index 4e5cc615b..8235f361e 100644 --- a/wagtail/tests/routablepage/migrations/0001_initial.py +++ b/wagtail/tests/routablepage/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.1 on 2016-02-12 10:55 -from __future__ import unicode_literals - import django.db.models.deletion from django.db import migrations, models diff --git a/wagtail/tests/routablepage/migrations/0002_routablepagewithoutindexroutetest.py b/wagtail/tests/routablepage/migrations/0002_routablepagewithoutindexroutetest.py index 9205239bc..f8fcf2e8e 100644 --- a/wagtail/tests/routablepage/migrations/0002_routablepagewithoutindexroutetest.py +++ b/wagtail/tests/routablepage/migrations/0002_routablepagewithoutindexroutetest.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.6 on 2016-05-10 10:31 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion import wagtail.contrib.routable_page.models diff --git a/wagtail/tests/routablepage/models.py b/wagtail/tests/routablepage/models.py index 23f239ec2..704fc3095 100644 --- a/wagtail/tests/routablepage/models.py +++ b/wagtail/tests/routablepage/models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.http import HttpResponse from wagtail.contrib.routable_page.models import RoutablePage, route diff --git a/wagtail/tests/search/apps.py b/wagtail/tests/search/apps.py index 4f567653f..a8e8c5ee3 100644 --- a/wagtail/tests/search/apps.py +++ b/wagtail/tests/search/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import AppConfig diff --git a/wagtail/tests/search/migrations/0001_initial.py b/wagtail/tests/search/migrations/0001_initial.py index 564a8f75c..33b9e6fb7 100644 --- a/wagtail/tests/search/migrations/0001_initial.py +++ b/wagtail/tests/search/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.6 on 2017-10-18 12:59 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion import taggit.managers diff --git a/wagtail/tests/search/models.py b/wagtail/tests/search/models.py index af02fb57c..cc8171448 100644 --- a/wagtail/tests/search/models.py +++ b/wagtail/tests/search/models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.db import models from taggit.managers import TaggableManager diff --git a/wagtail/tests/settings.py b/wagtail/tests/settings.py index 1136279dd..b04c99483 100644 --- a/wagtail/tests/settings.py +++ b/wagtail/tests/settings.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import os DEBUG = False diff --git a/wagtail/tests/snippets/apps.py b/wagtail/tests/snippets/apps.py index c84f125b1..26004ec2b 100644 --- a/wagtail/tests/snippets/apps.py +++ b/wagtail/tests/snippets/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import AppConfig diff --git a/wagtail/tests/snippets/forms.py b/wagtail/tests/snippets/forms.py index 95351359a..8c0332fee 100644 --- a/wagtail/tests/snippets/forms.py +++ b/wagtail/tests/snippets/forms.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from wagtail.admin.forms import WagtailAdminModelForm diff --git a/wagtail/tests/snippets/migrations/0001_initial.py b/wagtail/tests/snippets/migrations/0001_initial.py index 235931d80..7f7b611ce 100644 --- a/wagtail/tests/snippets/migrations/0001_initial.py +++ b/wagtail/tests/snippets/migrations/0001_initial.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/tests/snippets/migrations/0002_searchablesnippet.py b/wagtail/tests/snippets/migrations/0002_searchablesnippet.py index 851f28b0c..8d25643b1 100644 --- a/wagtail/tests/snippets/migrations/0002_searchablesnippet.py +++ b/wagtail/tests/snippets/migrations/0002_searchablesnippet.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models import wagtail.search.index diff --git a/wagtail/tests/snippets/migrations/0003_fancysnippet_standardsnippet.py b/wagtail/tests/snippets/migrations/0003_fancysnippet_standardsnippet.py index e528434f0..70bbf168c 100644 --- a/wagtail/tests/snippets/migrations/0003_fancysnippet_standardsnippet.py +++ b/wagtail/tests/snippets/migrations/0003_fancysnippet_standardsnippet.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.4 on 2016-03-29 04:28 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/tests/snippets/migrations/0004_fileuploadsnippet.py b/wagtail/tests/snippets/migrations/0004_fileuploadsnippet.py index 37af9fbbd..15448ed73 100644 --- a/wagtail/tests/snippets/migrations/0004_fileuploadsnippet.py +++ b/wagtail/tests/snippets/migrations/0004_fileuploadsnippet.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.4 on 2016-03-31 00:30 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/tests/snippets/migrations/0005_multisectionrichtextsnippet_richtextsection.py b/wagtail/tests/snippets/migrations/0005_multisectionrichtextsnippet_richtextsection.py index 631cfc2eb..a0130ae02 100644 --- a/wagtail/tests/snippets/migrations/0005_multisectionrichtextsnippet_richtextsection.py +++ b/wagtail/tests/snippets/migrations/0005_multisectionrichtextsnippet_richtextsection.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models import wagtail.core.fields import modelcluster.fields diff --git a/wagtail/tests/snippets/models.py b/wagtail/tests/snippets/models.py index d879b4a78..e3c92178e 100644 --- a/wagtail/tests/snippets/models.py +++ b/wagtail/tests/snippets/models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.db import models from modelcluster.fields import ParentalKey from modelcluster.models import ClusterableModel diff --git a/wagtail/tests/testapp/apps.py b/wagtail/tests/testapp/apps.py index c8675b242..8dedd7f25 100644 --- a/wagtail/tests/testapp/apps.py +++ b/wagtail/tests/testapp/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import AppConfig diff --git a/wagtail/tests/testapp/blocks.py b/wagtail/tests/testapp/blocks.py index b0854f539..8de8224a6 100644 --- a/wagtail/tests/testapp/blocks.py +++ b/wagtail/tests/testapp/blocks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from wagtail.core import blocks diff --git a/wagtail/tests/testapp/forms.py b/wagtail/tests/testapp/forms.py index 9810dfaac..244b33c72 100644 --- a/wagtail/tests/testapp/forms.py +++ b/wagtail/tests/testapp/forms.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django import forms from wagtail.admin.forms import WagtailAdminPageForm diff --git a/wagtail/tests/testapp/migrations/0001_initial.py b/wagtail/tests/testapp/migrations/0001_initial.py index 3cbcad65b..032928e6e 100644 --- a/wagtail/tests/testapp/migrations/0001_initial.py +++ b/wagtail/tests/testapp/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.1 on 2016-02-12 10:55 -from __future__ import unicode_literals - import django.db.models.deletion import modelcluster.contrib.taggit import modelcluster.fields diff --git a/wagtail/tests/testapp/migrations/0002_customimage_collections.py b/wagtail/tests/testapp/migrations/0002_customimage_collections.py index f098db654..7093f732f 100644 --- a/wagtail/tests/testapp/migrations/0002_customimage_collections.py +++ b/wagtail/tests/testapp/migrations/0002_customimage_collections.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.1 on 2016-02-14 12:22 -from __future__ import unicode_literals - import django.db.models.deletion from django.db import migrations, models diff --git a/wagtail/tests/testapp/migrations/0003_onetoonepage.py b/wagtail/tests/testapp/migrations/0003_onetoonepage.py index 0d0ad13c7..f2dbfcfd2 100644 --- a/wagtail/tests/testapp/migrations/0003_onetoonepage.py +++ b/wagtail/tests/testapp/migrations/0003_onetoonepage.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.1 on 2016-03-01 21:32 -from __future__ import unicode_literals - import django.db.models.deletion from django.db import migrations, models diff --git a/wagtail/tests/testapp/migrations/0004_fileuploadsetting.py b/wagtail/tests/testapp/migrations/0004_fileuploadsetting.py index 5e5ad06bf..1363bd643 100644 --- a/wagtail/tests/testapp/migrations/0004_fileuploadsetting.py +++ b/wagtail/tests/testapp/migrations/0004_fileuploadsetting.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.4 on 2016-03-31 00:31 -from __future__ import unicode_literals - import django.db.models.deletion from django.db import migrations, models diff --git a/wagtail/tests/testapp/migrations/0005_customrichblockfieldpage_customrichtextfieldpage_defaultrichblockfieldpage_defaultrichtextfieldpage.py b/wagtail/tests/testapp/migrations/0005_customrichblockfieldpage_customrichtextfieldpage_defaultrichblockfieldpage_defaultrichtextfieldpage.py index e4ad4e567..c2fb16ff2 100644 --- a/wagtail/tests/testapp/migrations/0005_customrichblockfieldpage_customrichtextfieldpage_defaultrichblockfieldpage_defaultrichtextfieldpage.py +++ b/wagtail/tests/testapp/migrations/0005_customrichblockfieldpage_customrichtextfieldpage_defaultrichblockfieldpage_defaultrichtextfieldpage.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.6 on 2016-05-12 20:56 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion import wagtail.core.blocks diff --git a/wagtail/tests/testapp/migrations/0006_sectionedrichtextpage_sectionedrichtextpagesection.py b/wagtail/tests/testapp/migrations/0006_sectionedrichtextpage_sectionedrichtextpagesection.py index 7721eb1dd..9c10788af 100644 --- a/wagtail/tests/testapp/migrations/0006_sectionedrichtextpage_sectionedrichtextpagesection.py +++ b/wagtail/tests/testapp/migrations/0006_sectionedrichtextpage_sectionedrichtextpagesection.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models import modelcluster.fields import wagtail.core.fields diff --git a/wagtail/tests/testapp/migrations/0007_jadeformpage.py b/wagtail/tests/testapp/migrations/0007_jadeformpage.py index 51ead790b..35da57d0d 100644 --- a/wagtail/tests/testapp/migrations/0007_jadeformpage.py +++ b/wagtail/tests/testapp/migrations/0007_jadeformpage.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2016-06-22 14:59 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion import modelcluster.fields diff --git a/wagtail/tests/testapp/migrations/0008_inlinestreampage_inlinestreampagesection.py b/wagtail/tests/testapp/migrations/0008_inlinestreampage_inlinestreampagesection.py index fa5800c58..d2dbcdd35 100644 --- a/wagtail/tests/testapp/migrations/0008_inlinestreampage_inlinestreampagesection.py +++ b/wagtail/tests/testapp/migrations/0008_inlinestreampage_inlinestreampagesection.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.8 on 2016-07-19 15:47 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion import modelcluster.fields diff --git a/wagtail/tests/testapp/migrations/0009_defaultstreampage.py b/wagtail/tests/testapp/migrations/0009_defaultstreampage.py index a115c0556..0fdc3f3a5 100644 --- a/wagtail/tests/testapp/migrations/0009_defaultstreampage.py +++ b/wagtail/tests/testapp/migrations/0009_defaultstreampage.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.1 on 2016-09-21 11:37 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion import wagtail.core.blocks diff --git a/wagtail/tests/testapp/migrations/0010_auto_20160823_1056.py b/wagtail/tests/testapp/migrations/0010_auto_20160823_1056.py index dc66d2191..a0061cc95 100644 --- a/wagtail/tests/testapp/migrations/0010_auto_20160823_1056.py +++ b/wagtail/tests/testapp/migrations/0010_auto_20160823_1056.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10 on 2016-08-23 15:56 -from __future__ import unicode_literals - from django.conf import settings from django.db import migrations, models import django.db.models.deletion diff --git a/wagtail/tests/testapp/migrations/0011_userprofile.py b/wagtail/tests/testapp/migrations/0011_userprofile.py index 3095b0e8f..f69090b81 100644 --- a/wagtail/tests/testapp/migrations/0011_userprofile.py +++ b/wagtail/tests/testapp/migrations/0011_userprofile.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.1 on 2016-09-28 23:49 -from __future__ import unicode_literals - from django.conf import settings from django.db import migrations, models import django.db.models.deletion diff --git a/wagtail/tests/testapp/migrations/0012_panelsettings_tabbedsettings.py b/wagtail/tests/testapp/migrations/0012_panelsettings_tabbedsettings.py index 1509612cf..a36c44813 100644 --- a/wagtail/tests/testapp/migrations/0012_panelsettings_tabbedsettings.py +++ b/wagtail/tests/testapp/migrations/0012_panelsettings_tabbedsettings.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.2 on 2016-10-08 09:58 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/wagtail/tests/testapp/migrations/0013_auto_20161220_1957.py b/wagtail/tests/testapp/migrations/0013_auto_20161220_1957.py index d68343ebd..f11ada9c3 100644 --- a/wagtail/tests/testapp/migrations/0013_auto_20161220_1957.py +++ b/wagtail/tests/testapp/migrations/0013_auto_20161220_1957.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2016-12-20 10:57 -from __future__ import unicode_literals - from django.db import migrations import wagtail.tests.testapp.models import wagtail.core.blocks diff --git a/wagtail/tests/testapp/migrations/0014_event_categories.py b/wagtail/tests/testapp/migrations/0014_event_categories.py index 9394fca77..0d9cd45b1 100644 --- a/wagtail/tests/testapp/migrations/0014_event_categories.py +++ b/wagtail/tests/testapp/migrations/0014_event_categories.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2017-01-24 15:04 -from __future__ import unicode_literals - from django.db import migrations, models import modelcluster.fields diff --git a/wagtail/tests/testapp/migrations/0015_auto_20170210_2058.py b/wagtail/tests/testapp/migrations/0015_auto_20170210_2058.py index e17acc440..13cd6709d 100644 --- a/wagtail/tests/testapp/migrations/0015_auto_20170210_2058.py +++ b/wagtail/tests/testapp/migrations/0015_auto_20170210_2058.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.5 on 2017-02-10 11:58 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion import wagtail.images.models diff --git a/wagtail/tests/testapp/migrations/0016_auto_20170303_2340.py b/wagtail/tests/testapp/migrations/0016_auto_20170303_2340.py index 6d86cddae..84f1293f0 100644 --- a/wagtail/tests/testapp/migrations/0016_auto_20170303_2340.py +++ b/wagtail/tests/testapp/migrations/0016_auto_20170303_2340.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.6 on 2017-03-03 14:40 -from __future__ import unicode_literals - from django.db import migrations diff --git a/wagtail/tests/testapp/migrations/0017_alwaysshowinmenuspage.py b/wagtail/tests/testapp/migrations/0017_alwaysshowinmenuspage.py index 5253df4b5..68e431b76 100644 --- a/wagtail/tests/testapp/migrations/0017_alwaysshowinmenuspage.py +++ b/wagtail/tests/testapp/migrations/0017_alwaysshowinmenuspage.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.6 on 2017-05-26 13:38 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/wagtail/tests/testapp/migrations/0018_multiselect_form_field.py b/wagtail/tests/testapp/migrations/0018_multiselect_form_field.py index 69c500216..e7f42a0f9 100644 --- a/wagtail/tests/testapp/migrations/0018_multiselect_form_field.py +++ b/wagtail/tests/testapp/migrations/0018_multiselect_form_field.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.1 on 2016-09-28 22:15 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/tests/testapp/migrations/0019_richtextfieldwithfeaturespage.py b/wagtail/tests/testapp/migrations/0019_richtextfieldwithfeaturespage.py index 861d244a1..bbd30ea84 100644 --- a/wagtail/tests/testapp/migrations/0019_richtextfieldwithfeaturespage.py +++ b/wagtail/tests/testapp/migrations/0019_richtextfieldwithfeaturespage.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.1 on 2017-07-13 22:20 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion import wagtail.core.fields diff --git a/wagtail/tests/testapp/migrations/0020_customdocument.py b/wagtail/tests/testapp/migrations/0020_customdocument.py index fc525687e..852cc7f07 100644 --- a/wagtail/tests/testapp/migrations/0020_customdocument.py +++ b/wagtail/tests/testapp/migrations/0020_customdocument.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.6 on 2017-04-12 18:00 -from __future__ import unicode_literals - from django.conf import settings from django.db import migrations, models import django.db.models.deletion diff --git a/wagtail/tests/testapp/migrations/0021_hidden_form_field.py b/wagtail/tests/testapp/migrations/0021_hidden_form_field.py index 5f246fa48..92971bf38 100644 --- a/wagtail/tests/testapp/migrations/0021_hidden_form_field.py +++ b/wagtail/tests/testapp/migrations/0021_hidden_form_field.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.6 on 2017-10-13 16:10 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/tests/testapp/migrations/0022_pagewithexcludedcopyfield.py b/wagtail/tests/testapp/migrations/0022_pagewithexcludedcopyfield.py index 0b1e5617f..4539372e0 100644 --- a/wagtail/tests/testapp/migrations/0022_pagewithexcludedcopyfield.py +++ b/wagtail/tests/testapp/migrations/0022_pagewithexcludedcopyfield.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.6 on 2017-11-02 01:03 -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/wagtail/tests/testapp/models.py b/wagtail/tests/testapp/models.py index 645051aa6..af980b52d 100644 --- a/wagtail/tests/testapp/models.py +++ b/wagtail/tests/testapp/models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import hashlib import json import os diff --git a/wagtail/tests/testapp/rich_text.py b/wagtail/tests/testapp/rich_text.py index f1d1391af..19730a2b6 100644 --- a/wagtail/tests/testapp/rich_text.py +++ b/wagtail/tests/testapp/rich_text.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import json from django.forms import Media, widgets diff --git a/wagtail/tests/testapp/urls.py b/wagtail/tests/testapp/urls.py index bee350907..dedebaff1 100644 --- a/wagtail/tests/testapp/urls.py +++ b/wagtail/tests/testapp/urls.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import url from wagtail.tests.testapp.views import bob_only_zone, message_test diff --git a/wagtail/tests/testapp/views.py b/wagtail/tests/testapp/views.py index c8c4de2c9..a06b064c1 100644 --- a/wagtail/tests/testapp/views.py +++ b/wagtail/tests/testapp/views.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.http import HttpResponse from django.shortcuts import redirect from django.template.response import TemplateResponse diff --git a/wagtail/tests/testapp/wagtail_hooks.py b/wagtail/tests/testapp/wagtail_hooks.py index 828ba5105..ed5e839a3 100644 --- a/wagtail/tests/testapp/wagtail_hooks.py +++ b/wagtail/tests/testapp/wagtail_hooks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django import forms from django.contrib.staticfiles.templatetags.staticfiles import static from django.http import HttpResponse diff --git a/wagtail/tests/urls.py b/wagtail/tests/urls.py index beac78a13..89782207d 100644 --- a/wagtail/tests/urls.py +++ b/wagtail/tests/urls.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import include, url from wagtail.api.v2.endpoints import PagesAPIEndpoint diff --git a/wagtail/tests/utils.py b/wagtail/tests/utils.py index 745c468f1..47d7ffa6b 100644 --- a/wagtail/tests/utils.py +++ b/wagtail/tests/utils.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import sys import warnings from contextlib import contextmanager diff --git a/wagtail/users/apps.py b/wagtail/users/apps.py index dd0736d1b..65eddd568 100644 --- a/wagtail/users/apps.py +++ b/wagtail/users/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.apps import AppConfig diff --git a/wagtail/users/forms.py b/wagtail/users/forms.py index f997d6faf..facc4b3a4 100644 --- a/wagtail/users/forms.py +++ b/wagtail/users/forms.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from itertools import groupby from django import forms diff --git a/wagtail/users/migrations/0001_initial.py b/wagtail/users/migrations/0001_initial.py index 4c3cceab4..834aea377 100644 --- a/wagtail/users/migrations/0001_initial.py +++ b/wagtail/users/migrations/0001_initial.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.conf import settings from django.db import migrations, models diff --git a/wagtail/users/migrations/0002_add_verbose_name_on_userprofile.py b/wagtail/users/migrations/0002_add_verbose_name_on_userprofile.py index 0d620c4bc..b7a129deb 100644 --- a/wagtail/users/migrations/0002_add_verbose_name_on_userprofile.py +++ b/wagtail/users/migrations/0002_add_verbose_name_on_userprofile.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/users/migrations/0003_add_verbose_names.py b/wagtail/users/migrations/0003_add_verbose_names.py index b28ded10b..78d67ea83 100644 --- a/wagtail/users/migrations/0003_add_verbose_names.py +++ b/wagtail/users/migrations/0003_add_verbose_names.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/wagtail/users/migrations/0004_capitalizeverbose.py b/wagtail/users/migrations/0004_capitalizeverbose.py index 510831ba0..e37c8c23b 100644 --- a/wagtail/users/migrations/0004_capitalizeverbose.py +++ b/wagtail/users/migrations/0004_capitalizeverbose.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/users/migrations/0005_make_related_name_wagtail_specific.py b/wagtail/users/migrations/0005_make_related_name_wagtail_specific.py index ecf69345a..cc00cacbc 100644 --- a/wagtail/users/migrations/0005_make_related_name_wagtail_specific.py +++ b/wagtail/users/migrations/0005_make_related_name_wagtail_specific.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.1 on 2016-09-28 23:49 -from __future__ import unicode_literals - from django.conf import settings from django.db import migrations, models import django.db.models.deletion diff --git a/wagtail/users/migrations/0006_userprofile_prefered_language.py b/wagtail/users/migrations/0006_userprofile_prefered_language.py index de2b5b27a..e766d2939 100644 --- a/wagtail/users/migrations/0006_userprofile_prefered_language.py +++ b/wagtail/users/migrations/0006_userprofile_prefered_language.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.5 on 2017-01-27 22:18 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/wagtail/users/models.py b/wagtail/users/models.py index f3ebf6f42..c47acadd2 100644 --- a/wagtail/users/models.py +++ b/wagtail/users/models.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf import settings from django.db import models from django.utils.translation import ugettext_lazy as _ diff --git a/wagtail/users/templatetags/wagtailusers_tags.py b/wagtail/users/templatetags/wagtailusers_tags.py index e364dd4df..8d142749f 100644 --- a/wagtail/users/templatetags/wagtailusers_tags.py +++ b/wagtail/users/templatetags/wagtailusers_tags.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import itertools from django import template diff --git a/wagtail/users/tests.py b/wagtail/users/tests.py index e852fdfe5..42d07bacc 100644 --- a/wagtail/users/tests.py +++ b/wagtail/users/tests.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django import forms from django.contrib.auth import get_user_model from django.contrib.auth.models import Group, Permission diff --git a/wagtail/users/urls/users.py b/wagtail/users/urls/users.py index b5359ec3d..5db0872c4 100644 --- a/wagtail/users/urls/users.py +++ b/wagtail/users/urls/users.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import url from wagtail.users.views import users diff --git a/wagtail/users/utils.py b/wagtail/users/utils.py index 4272e0bbd..7a21d7382 100644 --- a/wagtail/users/utils.py +++ b/wagtail/users/utils.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from wagtail.core.compat import AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME delete_user_perm = "{0}.delete_{1}".format(AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME.lower()) diff --git a/wagtail/users/views/groups.py b/wagtail/users/views/groups.py index b9b71739b..dd3256afa 100644 --- a/wagtail/users/views/groups.py +++ b/wagtail/users/views/groups.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.contrib.auth.models import Group from django.utils.translation import ugettext as _ diff --git a/wagtail/users/views/users.py b/wagtail/users/views/users.py index 432cc89b5..c3e1522ed 100644 --- a/wagtail/users/views/users.py +++ b/wagtail/users/views/users.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.core.exceptions import ImproperlyConfigured diff --git a/wagtail/users/wagtail_hooks.py b/wagtail/users/wagtail_hooks.py index 904e12b80..c90c8a787 100644 --- a/wagtail/users/wagtail_hooks.py +++ b/wagtail/users/wagtail_hooks.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import include, url from django.contrib.auth.models import Permission from django.db.models import Q diff --git a/wagtail/users/widgets.py b/wagtail/users/widgets.py index 6c7fa50c3..e3de886cb 100644 --- a/wagtail/users/widgets.py +++ b/wagtail/users/widgets.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from wagtail.admin.widgets import Button diff --git a/wagtail/utils/apps.py b/wagtail/utils/apps.py index 93786a27f..cd6f17c2f 100644 --- a/wagtail/utils/apps.py +++ b/wagtail/utils/apps.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from importlib import import_module from django.apps import apps diff --git a/wagtail/utils/compat.py b/wagtail/utils/compat.py index 01e6d4f49..e69de29bb 100644 --- a/wagtail/utils/compat.py +++ b/wagtail/utils/compat.py @@ -1 +0,0 @@ -from __future__ import absolute_import, unicode_literals diff --git a/wagtail/utils/decorators.py b/wagtail/utils/decorators.py index 86ddd8699..687c6be94 100644 --- a/wagtail/utils/decorators.py +++ b/wagtail/utils/decorators.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import functools from django.utils.functional import cached_property diff --git a/wagtail/utils/deprecation.py b/wagtail/utils/deprecation.py index 525e38530..68f0ca3a5 100644 --- a/wagtail/utils/deprecation.py +++ b/wagtail/utils/deprecation.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - class RemovedInWagtail21Warning(DeprecationWarning): pass diff --git a/wagtail/utils/pagination.py b/wagtail/utils/pagination.py index a764133e3..20f8bd1f2 100644 --- a/wagtail/utils/pagination.py +++ b/wagtail/utils/pagination.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from urllib.parse import parse_qs from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator diff --git a/wagtail/utils/sendfile.py b/wagtail/utils/sendfile.py index da4de76b8..c3f859098 100644 --- a/wagtail/utils/sendfile.py +++ b/wagtail/utils/sendfile.py @@ -1,8 +1,6 @@ # Copied from django-sendfile 0.3.6 and tweaked to allow a backend to be passed # to sendfile() # See: https://github.com/johnsensible/django-sendfile/pull/33 -from __future__ import absolute_import, unicode_literals - import os.path from mimetypes import guess_type diff --git a/wagtail/utils/sendfile_streaming_backend.py b/wagtail/utils/sendfile_streaming_backend.py index 206d00d76..82515bcb2 100644 --- a/wagtail/utils/sendfile_streaming_backend.py +++ b/wagtail/utils/sendfile_streaming_backend.py @@ -1,8 +1,6 @@ # Sendfile "streaming" backend # This is based on sendfiles builtin "simple" backend but uses a StreamingHttpResponse -from __future__ import absolute_import, unicode_literals - import os import re import stat diff --git a/wagtail/utils/setup.py b/wagtail/utils/setup.py index c2e23d014..bc501c53d 100644 --- a/wagtail/utils/setup.py +++ b/wagtail/utils/setup.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function, unicode_literals - import io import json import os diff --git a/wagtail/utils/urlpatterns.py b/wagtail/utils/urlpatterns.py index 8a80da50c..1d61e51aa 100644 --- a/wagtail/utils/urlpatterns.py +++ b/wagtail/utils/urlpatterns.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from functools import update_wrapper diff --git a/wagtail/utils/utils.py b/wagtail/utils/utils.py index bbc095fb1..2ecd07ff8 100644 --- a/wagtail/utils/utils.py +++ b/wagtail/utils/utils.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import collections diff --git a/wagtail/utils/version.py b/wagtail/utils/version.py index 9a746c5d7..19b29b61e 100644 --- a/wagtail/utils/version.py +++ b/wagtail/utils/version.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - # This file is heavily inspired by django.utils.version diff --git a/wagtail/utils/widgets.py b/wagtail/utils/widgets.py index 6c232bb64..c08c3f1b8 100644 --- a/wagtail/utils/widgets.py +++ b/wagtail/utils/widgets.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - from django.forms.widgets import Widget from django.utils.safestring import mark_safe