Removed __future__ imports

Also delete add_imports directive from isort configuration
wagtail · Nov 27, 2017 · 8b420b9 · 8b420b9
1 parent cde0faf
commit 8b420b9
Show file tree

Hide file tree

Showing 549 changed files with 3 additions and 1,100 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -7,8 +7,6 @@
 # <img src="{% gravatar_url sometemplatevariable %}">
 # just make sure to update the "default" image path below
 
-from __future__ import absolute_import, unicode_literals
-
 import hashlib
 from urllib.parse import urlencode
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from functools import wraps
 
 from django.conf import settings
Original file line number	Diff line number	Diff line change
		@@ -1,5 +1,3 @@
		from __future__ import absolute_import, unicode_literals

		from wagtail.core.models import Page


Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,5 +1,3 @@
		from __future__ import absolute_import, unicode_literals

		from django.template.loader import render_to_string


Expand Down