matthewwillian · Jan 19, 2017 · matthewwillian · Jan 19, 2017 · claudep · Jan 19, 2017
diff --git a/django/conf/locale/ja/formats.py b/django/conf/locale/ja/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'Y年n月j日'
diff --git a/django/conf/locale/ka/formats.py b/django/conf/locale/ka/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'l, j F, Y'
diff --git a/django/conf/locale/km/formats.py b/django/conf/locale/km/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j ខែ F ឆ្នាំ Y'
diff --git a/django/conf/locale/kn/formats.py b/django/conf/locale/kn/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j F Y'
diff --git a/django/conf/locale/ko/formats.py b/django/conf/locale/ko/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'Y년 n월 j일'
diff --git a/django/conf/locale/lt/formats.py b/django/conf/locale/lt/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = r'Y \m. E j \d.'
diff --git a/django/conf/locale/lv/formats.py b/django/conf/locale/lv/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = r'Y. \g\a\d\a j. F'
diff --git a/django/conf/locale/mk/formats.py b/django/conf/locale/mk/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'd F Y'
diff --git a/django/conf/locale/ml/formats.py b/django/conf/locale/ml/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'N j, Y'
diff --git a/django/conf/locale/mn/formats.py b/django/conf/locale/mn/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'd F Y'
diff --git a/django/conf/locale/nb/formats.py b/django/conf/locale/nb/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j. F Y'
diff --git a/django/conf/locale/nl/formats.py b/django/conf/locale/nl/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j F Y'                   # '20 januari 2009'
diff --git a/django/conf/locale/nn/formats.py b/django/conf/locale/nn/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j. F Y'
diff --git a/django/conf/locale/pl/formats.py b/django/conf/locale/pl/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j E Y'
diff --git a/django/conf/locale/pt/formats.py b/django/conf/locale/pt/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = r'j \d\e F \d\e Y'
diff --git a/django/conf/locale/pt_BR/formats.py b/django/conf/locale/pt_BR/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = r'j \d\e F \d\e Y'
diff --git a/django/conf/locale/ro/formats.py b/django/conf/locale/ro/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j F Y'
diff --git a/django/conf/locale/ru/formats.py b/django/conf/locale/ru/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j E Y г.'
diff --git a/django/conf/locale/sk/formats.py b/django/conf/locale/sk/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j. F Y'
diff --git a/django/conf/locale/sl/formats.py b/django/conf/locale/sl/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'd. F Y'
diff --git a/django/conf/locale/sq/formats.py b/django/conf/locale/sq/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'd F Y'
diff --git a/django/conf/locale/sr/formats.py b/django/conf/locale/sr/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j. F Y.'
diff --git a/django/conf/locale/sr_Latn/formats.py b/django/conf/locale/sr_Latn/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j. F Y.'
diff --git a/django/conf/locale/sv/formats.py b/django/conf/locale/sv/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j F Y'
diff --git a/django/conf/locale/ta/formats.py b/django/conf/locale/ta/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j F, Y'
diff --git a/django/conf/locale/te/formats.py b/django/conf/locale/te/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j F Y'
diff --git a/django/conf/locale/th/formats.py b/django/conf/locale/th/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'j F Y'
diff --git a/django/conf/locale/tr/formats.py b/django/conf/locale/tr/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'd F Y'
diff --git a/django/conf/locale/uk/formats.py b/django/conf/locale/uk/formats.py
@@ -1,9 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'd E Y р.'
diff --git a/django/conf/locale/vi/formats.py b/django/conf/locale/vi/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = r'\N\gà\y d \t\há\n\g n \nă\m Y'
diff --git a/django/conf/locale/zh_Hans/formats.py b/django/conf/locale/zh_Hans/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'Y年n月j日'                # 2016年9月5日
diff --git a/django/conf/locale/zh_Hant/formats.py b/django/conf/locale/zh_Hant/formats.py
@@ -1,8 +1,5 @@
-# -*- encoding: utf-8 -*-
 # This file is distributed under the same license as the Django package.
 #
-from __future__ import unicode_literals
-
 # The *_FORMAT strings use the Django date format syntax,
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
 DATE_FORMAT = 'Y年n月j日'                # 2016年9月5日
diff --git a/django/contrib/admin/checks.py b/django/contrib/admin/checks.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from itertools import chain

 from django.apps import apps
diff --git a/django/contrib/admin/forms.py b/django/contrib/admin/forms.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django import forms
 from django.contrib.auth.forms import AuthenticationForm, PasswordChangeForm
 from django.utils.translation import ugettext_lazy as _
diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import json

 from django import forms
diff --git a/django/contrib/admin/migrations/0001_initial.py b/django/contrib/admin/migrations/0001_initial.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import django.contrib.admin.models
 from django.conf import settings
 from django.db import migrations, models
diff --git a/django/contrib/admin/migrations/0002_logentry_remove_auto_add.py b/django/contrib/admin/migrations/0002_logentry_remove_auto_add.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 from django.utils import timezone

diff --git a/django/contrib/admin/models.py b/django/contrib/admin/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import json

 from django.conf import settings
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import copy
 import json
 import operator
diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime

 from django.contrib.admin.templatetags.admin_urls import add_preserved_filters
diff --git a/django/contrib/admin/utils.py b/django/contrib/admin/utils.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime
 import decimal
 from collections import defaultdict
diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py
@@ -1,8 +1,6 @@
 """
 Form Widget classes specific to the Django admin site.
 """
-from __future__ import unicode_literals
-
 import copy

 from django import forms
diff --git a/django/contrib/auth/backends.py b/django/contrib/auth/backends.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Permission

diff --git a/django/contrib/auth/base_user.py b/django/contrib/auth/base_user.py
@@ -2,8 +2,6 @@
 This module allows importing AbstractBaseUser even when django.contrib.auth is
 not in INSTALLED_APPS.
 """
-from __future__ import unicode_literals
-
 import unicodedata

 from django.contrib.auth import password_validation
diff --git a/django/contrib/auth/checks.py b/django/contrib/auth/checks.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from itertools import chain
 from types import MethodType

diff --git a/django/contrib/auth/forms.py b/django/contrib/auth/forms.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import unicodedata

 from django import forms
diff --git a/django/contrib/auth/hashers.py b/django/contrib/auth/hashers.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import base64
 import binascii
 import hashlib
diff --git a/django/contrib/auth/management/__init__.py b/django/contrib/auth/management/__init__.py
@@ -1,8 +1,6 @@
 """
 Creates permissions for all installed apps that need permissions.
 """
-from __future__ import unicode_literals
-
 import getpass
 import unicodedata

diff --git a/django/contrib/auth/management/commands/changepassword.py b/django/contrib/auth/management/commands/changepassword.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import getpass

 from django.contrib.auth import get_user_model
diff --git a/django/contrib/auth/management/commands/createsuperuser.py b/django/contrib/auth/management/commands/createsuperuser.py
@@ -1,8 +1,6 @@
 """
 Management utility to create superusers.
 """
-from __future__ import unicode_literals
-
 import getpass
 import sys

diff --git a/django/contrib/auth/migrations/0001_initial.py b/django/contrib/auth/migrations/0001_initial.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import django.contrib.auth.models
 from django.contrib.auth import validators
 from django.db import migrations, models
diff --git a/django/contrib/auth/migrations/0002_alter_permission_name_max_length.py b/django/contrib/auth/migrations/0002_alter_permission_name_max_length.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models


diff --git a/django/contrib/auth/migrations/0003_alter_user_email_max_length.py b/django/contrib/auth/migrations/0003_alter_user_email_max_length.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models


diff --git a/django/contrib/auth/migrations/0004_alter_user_username_opts.py b/django/contrib/auth/migrations/0004_alter_user_username_opts.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.contrib.auth import validators
 from django.db import migrations, models
 from django.utils import six
diff --git a/django/contrib/auth/migrations/0005_alter_user_last_login_null.py b/django/contrib/auth/migrations/0005_alter_user_last_login_null.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models


diff --git a/django/contrib/auth/migrations/0006_require_contenttypes_0002.py b/django/contrib/auth/migrations/0006_require_contenttypes_0002.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations


diff --git a/django/contrib/auth/migrations/0007_alter_validators_add_error_messages.py b/django/contrib/auth/migrations/0007_alter_validators_add_error_messages.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.contrib.auth import validators
 from django.db import migrations, models
 from django.utils import six
diff --git a/django/contrib/auth/migrations/0008_alter_user_username_max_length.py b/django/contrib/auth/migrations/0008_alter_user_username_max_length.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.contrib.auth import validators
 from django.db import migrations, models
 from django.utils import six
diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib import auth
 from django.contrib.auth.base_user import AbstractBaseUser, BaseUserManager
 from django.contrib.auth.signals import user_logged_in
diff --git a/django/contrib/auth/password_validation.py b/django/contrib/auth/password_validation.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import gzip
 import os
 import re
diff --git a/django/contrib/contenttypes/admin.py b/django/contrib/contenttypes/admin.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from functools import partial

 from django.contrib.admin.checks import InlineModelAdminChecks
diff --git a/django/contrib/contenttypes/checks.py b/django/contrib/contenttypes/checks.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from itertools import chain

 from django.apps import apps
diff --git a/django/contrib/contenttypes/fields.py b/django/contrib/contenttypes/fields.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from collections import defaultdict

 from django.contrib.contenttypes.models import ContentType
diff --git a/django/contrib/contenttypes/forms.py b/django/contrib/contenttypes/forms.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.forms import ModelForm, modelformset_factory
diff --git a/django/contrib/contenttypes/migrations/0001_initial.py b/django/contrib/contenttypes/migrations/0001_initial.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import django.contrib.contenttypes.models
 from django.db import migrations, models

diff --git a/django/contrib/contenttypes/migrations/0002_remove_content_type_name.py b/django/contrib/contenttypes/migrations/0002_remove_content_type_name.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models


diff --git a/django/contrib/contenttypes/models.py b/django/contrib/contenttypes/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from collections import defaultdict

 from django.apps import apps
diff --git a/django/contrib/contenttypes/views.py b/django/contrib/contenttypes/views.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django import http
 from django.apps import apps
 from django.contrib.contenttypes.models import ContentType
diff --git a/django/contrib/flatpages/migrations/0001_initial.py b/django/contrib/flatpages/migrations/0001_initial.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models


diff --git a/django/contrib/flatpages/models.py b/django/contrib/flatpages/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.sites.models import Site
 from django.db import models
 from django.urls import get_script_prefix
diff --git a/django/contrib/gis/db/backends/postgis/adapter.py b/django/contrib/gis/db/backends/postgis/adapter.py
@@ -1,8 +1,6 @@
 """
 This object provides quoting for GEOS geometries into PostgreSQL/PostGIS.
 """
-from __future__ import unicode_literals
-
 from psycopg2 import Binary
 from psycopg2.extensions import ISQLQuote

diff --git a/django/contrib/gis/db/models/lookups.py b/django/contrib/gis/db/models/lookups.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import re

 from django.core.exceptions import FieldDoesNotExist
diff --git a/django/contrib/gis/db/models/sql/conversion.py b/django/contrib/gis/db/models/sql/conversion.py
@@ -2,8 +2,6 @@
 This module holds simple classes to convert geospatial values from the
 database.
 """
-from __future__ import unicode_literals
-
 from decimal import Decimal

 from django.contrib.gis.db.models.fields import GeoSelectFormatMixin
diff --git a/django/contrib/gis/feeds.py b/django/contrib/gis/feeds.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.syndication.views import Feed as BaseFeed
 from django.utils.feedgenerator import Atom1Feed, Rss201rev2Feed

diff --git a/django/contrib/gis/forms/fields.py b/django/contrib/gis/forms/fields.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django import forms
 from django.contrib.gis.geos import GEOSException, GEOSGeometry
 from django.utils.translation import ugettext_lazy as _
diff --git a/django/contrib/gis/forms/widgets.py b/django/contrib/gis/forms/widgets.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import logging

 from django.conf import settings
diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import logging
 import os
 import re
diff --git a/django/contrib/gis/geos/geometry.py b/django/contrib/gis/geos/geometry.py
@@ -2,8 +2,6 @@
 This module contains the 'base' GEOSGeometry object -- all GEOS Geometries
 inherit from this object.
 """
-from __future__ import unicode_literals
-
 import json
 from ctypes import addressof, byref, c_double

diff --git a/django/contrib/gis/serializers/geojson.py b/django/contrib/gis/serializers/geojson.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.gis.gdal import HAS_GDAL
 from django.core.serializers.base import SerializerDoesNotExist
 from django.core.serializers.json import Serializer as JSONSerializer
diff --git a/django/contrib/gis/sitemaps/views.py b/django/contrib/gis/sitemaps/views.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.apps import apps
 from django.contrib.gis.db.models.fields import GeometryField
 from django.contrib.gis.db.models.functions import AsKML, Transform
diff --git a/django/contrib/gis/views.py b/django/contrib/gis/views.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.http import Http404
 from django.utils.translation import ugettext as _

diff --git a/django/contrib/humanize/templatetags/humanize.py b/django/contrib/humanize/templatetags/humanize.py
@@ -1,6 +1,3 @@
-# -*- encoding: utf-8 -*-
-from __future__ import unicode_literals
-
 import re
 from datetime import date, datetime
 from decimal import Decimal
diff --git a/django/contrib/messages/storage/base.py b/django/contrib/messages/storage/base.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.contrib.messages import constants, utils
 from django.utils.encoding import force_text, python_2_unicode_compatible
diff --git a/django/contrib/postgres/indexes.py b/django/contrib/postgres/indexes.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db.models import Index

 __all__ = ['BrinIndex', 'GinIndex']
diff --git a/django/contrib/postgres/utils.py b/django/contrib/postgres/utils.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.core.exceptions import ValidationError
 from django.utils.functional import SimpleLazyObject
 from django.utils.text import format_lazy
diff --git a/django/contrib/redirects/middleware.py b/django/contrib/redirects/middleware.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django import http
 from django.apps import apps
 from django.conf import settings
diff --git a/django/contrib/redirects/migrations/0001_initial.py b/django/contrib/redirects/migrations/0001_initial.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models


diff --git a/django/contrib/sessions/backends/base.py b/django/contrib/sessions/backends/base.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import base64
 import logging
 import string
diff --git a/django/contrib/sessions/base_session.py b/django/contrib/sessions/base_session.py
@@ -2,8 +2,6 @@
 This module allows importing AbstractBaseSession even
 when django.contrib.sessions is not in INSTALLED_APPS.
 """
-from __future__ import unicode_literals
-
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
diff --git a/django/contrib/sessions/migrations/0001_initial.py b/django/contrib/sessions/migrations/0001_initial.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import django.contrib.sessions.models
 from django.db import migrations, models

diff --git a/django/contrib/sessions/models.py b/django/contrib/sessions/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.sessions.base_session import (
    AbstractBaseSession, BaseSessionManager,
 )
diff --git a/django/contrib/sites/managers.py b/django/contrib/sites/managers.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.core import checks
 from django.core.exceptions import FieldDoesNotExist
diff --git a/django/contrib/sites/migrations/0001_initial.py b/django/contrib/sites/migrations/0001_initial.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import django.contrib.sites.models
 from django.contrib.sites.models import _simple_domain_name_validator
 from django.db import migrations, models
diff --git a/django/contrib/sites/migrations/0002_alter_domain_unique.py b/django/contrib/sites/migrations/0002_alter_domain_unique.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import django.contrib.sites.models
 from django.db import migrations, models

diff --git a/django/contrib/sites/models.py b/django/contrib/sites/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import string

 from django.core.exceptions import ImproperlyConfigured, ValidationError
diff --git a/django/contrib/sites/requests.py b/django/contrib/sites/requests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.utils.encoding import python_2_unicode_compatible


diff --git a/django/contrib/sites/shortcuts.py b/django/contrib/sites/shortcuts.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.apps import apps


diff --git a/django/contrib/staticfiles/management/commands/collectstatic.py b/django/contrib/staticfiles/management/commands/collectstatic.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os
 from collections import OrderedDict

diff --git a/django/contrib/staticfiles/management/commands/findstatic.py b/django/contrib/staticfiles/management/commands/findstatic.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os

 from django.contrib.staticfiles import finders
diff --git a/django/contrib/staticfiles/storage.py b/django/contrib/staticfiles/storage.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import hashlib
 import json
 import os
diff --git a/django/contrib/syndication/views.py b/django/contrib/syndication/views.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from calendar import timegm

 from django.conf import settings
diff --git a/django/core/cache/backends/base.py b/django/core/cache/backends/base.py
@@ -1,6 +1,4 @@
 "Base Cache class."
-from __future__ import unicode_literals
-
 import time
 import warnings

diff --git a/django/core/cache/utils.py b/django/core/cache/utils.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import hashlib

 from django.utils.encoding import force_bytes
diff --git a/django/core/checks/__init__.py b/django/core/checks/__init__.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from .messages import (
    CRITICAL, DEBUG, ERROR, INFO, WARNING, CheckMessage, Critical, Debug,
    Error, Info, Warning,
diff --git a/django/core/checks/caches.py b/django/core/checks/caches.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.core.cache import DEFAULT_CACHE_ALIAS

diff --git a/django/core/checks/messages.py b/django/core/checks/messages.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.utils.encoding import force_str, python_2_unicode_compatible

 # Levels
diff --git a/django/core/checks/model_checks.py b/django/core/checks/model_checks.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import inspect
 import types
 from itertools import chain
diff --git a/django/core/checks/registry.py b/django/core/checks/registry.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from itertools import chain

 from django.utils.itercompat import is_iterable
diff --git a/django/core/checks/templates.py b/django/core/checks/templates.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import copy

 from django.conf import settings
diff --git a/django/core/checks/urls.py b/django/core/checks/urls.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from collections import Counter

 from django.conf import settings
diff --git a/django/core/files/base.py b/django/core/files/base.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os
 from io import BytesIO, StringIO, UnsupportedOperation

diff --git a/django/core/files/uploadhandler.py b/django/core/files/uploadhandler.py
@@ -2,8 +2,6 @@
 Base file upload handler classes, and the built-in concrete subclasses
 """

-from __future__ import unicode_literals
-
 from io import BytesIO

 from django.conf import settings
diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import logging
 import types

diff --git a/django/core/handlers/exception.py b/django/core/handlers/exception.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import logging
 import sys
 from functools import wraps
diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import cgi
 import codecs
 import re
diff --git a/django/core/mail/__init__.py b/django/core/mail/__init__.py
@@ -1,8 +1,6 @@
 """
 Tools for sending email.
 """
-from __future__ import unicode_literals
-
 from django.conf import settings
 # Imported for backwards compatibility and for the sake
 # of a cleaner namespace. These symbols used to be in
diff --git a/django/core/mail/message.py b/django/core/mail/message.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import mimetypes
 import os
 import random
diff --git a/django/core/management/__init__.py b/django/core/management/__init__.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os
 import pkgutil
 import sys
diff --git a/django/core/management/base.py b/django/core/management/base.py
@@ -1,10 +1,7 @@
-# -*- coding: utf-8 -*-
 """
 Base classes for writing management commands (named commands which can
 be executed through ``django-admin`` or ``manage.py``).
 """
-from __future__ import unicode_literals
-
 import os
 import sys
 from argparse import ArgumentParser
diff --git a/django/core/management/commands/check.py b/django/core/management/commands/check.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.apps import apps
 from django.core import checks
 from django.core.checks.registry import registry
diff --git a/django/core/management/commands/compilemessages.py b/django/core/management/commands/compilemessages.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import codecs
 import glob
 import os
diff --git a/django/core/management/commands/flush.py b/django/core/management/commands/flush.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import sys
 from importlib import import_module

diff --git a/django/core/management/commands/inspectdb.py b/django/core/management/commands/inspectdb.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import keyword
 import re
 from collections import OrderedDict
@@ -56,8 +54,6 @@ def strip_prefix(s):
                "Django to create, modify, and delete the table"
            )
            yield "# Feel free to rename the models, but don't rename db_table values or field names."
-            yield "from __future__ import unicode_literals"
-            yield ''
            yield 'from %s import models' % self.db_module
            known_models = []
            tables_to_introspect = options['table'] or connection.introspection.table_names(cursor)
diff --git a/django/core/management/commands/loaddata.py b/django/core/management/commands/loaddata.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import glob
 import gzip
 import os
diff --git a/django/core/management/commands/makemessages.py b/django/core/management/commands/makemessages.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import fnmatch
 import glob
 import io
diff --git a/django/core/management/commands/migrate.py b/django/core/management/commands/migrate.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import time
 from collections import OrderedDict
 from importlib import import_module
diff --git a/django/core/management/commands/runserver.py b/django/core/management/commands/runserver.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import errno
 import os
 import re
diff --git a/django/core/management/commands/showmigrations.py b/django/core/management/commands/showmigrations.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.core.management.base import BaseCommand, CommandError
 from django.db import DEFAULT_DB_ALIAS, connections
 from django.db.migrations.loader import MigrationLoader
diff --git a/django/core/management/commands/sqlflush.py b/django/core/management/commands/sqlflush.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.core.management.base import BaseCommand
 from django.core.management.sql import sql_flush
 from django.db import DEFAULT_DB_ALIAS, connections
diff --git a/django/core/management/commands/sqlmigrate.py b/django/core/management/commands/sqlmigrate.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.core.management.base import BaseCommand, CommandError
 from django.db import DEFAULT_DB_ALIAS, connections
 from django.db.migrations.executor import MigrationExecutor
diff --git a/django/core/management/commands/sqlsequencereset.py b/django/core/management/commands/sqlsequencereset.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.core.management.base import AppCommand
 from django.db import DEFAULT_DB_ALIAS, connections

diff --git a/django/core/management/sql.py b/django/core/management/sql.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.apps import apps
 from django.db import models

diff --git a/django/core/management/templates.py b/django/core/management/templates.py
@@ -113,8 +113,6 @@ def handle(self, app_or_project, name, target=None, **options):
            camel_case_name: camel_case_value,
            'docs_version': get_docs_version(),
            'django_version': django.__version__,
-            'unicode_literals': '' if six.PY3 else '# -*- coding: utf-8 -*-\n'
-                                                   'from __future__ import unicode_literals\n\n',
        }), autoescape=False)

        # Setup a stub settings environment for template rendering
diff --git a/django/core/management/utils.py b/django/core/management/utils.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os
 import sys
 from subprocess import PIPE, Popen
diff --git a/django/core/serializers/json.py b/django/core/serializers/json.py
@@ -2,9 +2,6 @@
 Serialize data to/from JSON
 """

-# Avoid shadowing the standard library json module
-from __future__ import absolute_import, unicode_literals
-
 import datetime
 import decimal
 import json
diff --git a/django/core/serializers/python.py b/django/core/serializers/python.py
@@ -3,8 +3,6 @@
 and from basic Python data types (lists, dicts, strings, etc.). Useful as a basis for
 other serializers.
 """
-from __future__ import unicode_literals
-
 from collections import OrderedDict

 from django.apps import apps
diff --git a/django/core/serializers/xml_serializer.py b/django/core/serializers/xml_serializer.py
@@ -2,8 +2,6 @@
 XML serializer.
 """

-from __future__ import unicode_literals
-
 from collections import OrderedDict
 from xml.dom import pulldom
 from xml.sax import handler
diff --git a/django/core/servers/basehttp.py b/django/core/servers/basehttp.py
@@ -7,8 +7,6 @@
 been reviewed for security issues. DON'T USE IT FOR PRODUCTION USE!
 """

-from __future__ import unicode_literals
-
 import logging
 import socket
 import sys
diff --git a/django/core/signing.py b/django/core/signing.py
@@ -33,8 +33,6 @@
 These functions make use of all of them.
 """

-from __future__ import unicode_literals
-
 import base64
 import datetime
 import json
diff --git a/django/core/validators.py b/django/core/validators.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os
 import re

diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py
@@ -4,8 +4,6 @@
 Requires mysqlclient: https://pypi.python.org/pypi/mysqlclient/
 MySQLdb is supported for Python 2 only: http://sourceforge.net/projects/mysql-python
 """
-from __future__ import unicode_literals
-
 import re
 import sys

diff --git a/django/db/backends/mysql/operations.py b/django/db/backends/mysql/operations.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import uuid

 from django.conf import settings
diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py
@@ -3,8 +3,6 @@

 Requires cx_Oracle: http://cx-oracle.sourceforge.net/
 """
-from __future__ import unicode_literals
-
 import datetime
 import decimal
 import os
diff --git a/django/db/backends/oracle/operations.py b/django/db/backends/oracle/operations.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime
 import re
 import uuid
diff --git a/django/db/backends/postgresql/introspection.py b/django/db/backends/postgresql/introspection.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import warnings

 from django.db.backends.base.introspection import (
diff --git a/django/db/backends/postgresql/operations.py b/django/db/backends/postgresql/operations.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from psycopg2.extras import Inet

 from django.conf import settings
diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py
@@ -4,8 +4,6 @@
 Works with either the pysqlite2 module or the sqlite3 module in the
 standard library.
 """
-from __future__ import unicode_literals
-
 import decimal
 import re
 import warnings
diff --git a/django/db/backends/sqlite3/features.py b/django/db/backends/sqlite3/features.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db import utils
 from django.db.backends.base.features import BaseDatabaseFeatures
 from django.utils import six
diff --git a/django/db/backends/sqlite3/operations.py b/django/db/backends/sqlite3/operations.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime
 import uuid

diff --git a/django/db/backends/utils.py b/django/db/backends/utils.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime
 import decimal
 import hashlib
diff --git a/django/db/migrations/autodetector.py b/django/db/migrations/autodetector.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import functools
 import re
 from itertools import chain
diff --git a/django/db/migrations/exceptions.py b/django/db/migrations/exceptions.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db.utils import DatabaseError
 from django.utils.encoding import python_2_unicode_compatible

diff --git a/django/db/migrations/executor.py b/django/db/migrations/executor.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.apps.registry import apps as global_apps
 from django.db import migrations, router

diff --git a/django/db/migrations/graph.py b/django/db/migrations/graph.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import sys
 import warnings
 from collections import deque
diff --git a/django/db/migrations/loader.py b/django/db/migrations/loader.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os
 import sys
 from importlib import import_module
diff --git a/django/db/migrations/migration.py b/django/db/migrations/migration.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db.transaction import atomic
 from django.utils.encoding import python_2_unicode_compatible

diff --git a/django/db/migrations/operations/base.py b/django/db/migrations/operations/base.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db import router


diff --git a/django/db/migrations/operations/fields.py b/django/db/migrations/operations/fields.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db.models.fields import NOT_PROVIDED
 from django.utils.functional import cached_property

diff --git a/django/db/migrations/operations/models.py b/django/db/migrations/operations/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db import models
 from django.db.migrations.operations.base import Operation
 from django.db.migrations.state import ModelState
diff --git a/django/db/migrations/operations/special.py b/django/db/migrations/operations/special.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db import router

 from .base import Operation
diff --git a/django/db/migrations/optimizer.py b/django/db/migrations/optimizer.py
@@ -1,6 +1,3 @@
-from __future__ import unicode_literals
-
-
 class MigrationOptimizer(object):
    """
    Powers the optimization process, where you provide a list of Operations
diff --git a/django/db/migrations/questioner.py b/django/db/migrations/questioner.py
@@ -1,5 +1,3 @@
-from __future__ import print_function, unicode_literals
-
 import importlib
 import os
 import sys
diff --git a/django/db/migrations/recorder.py b/django/db/migrations/recorder.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.apps.registry import Apps
 from django.db import models
 from django.db.utils import DatabaseError
diff --git a/django/db/migrations/serializer.py b/django/db/migrations/serializer.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import collections
 import datetime
 import decimal
diff --git a/django/db/migrations/state.py b/django/db/migrations/state.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import copy
 from collections import OrderedDict
 from contextlib import contextmanager
diff --git a/django/db/migrations/writer.py b/django/db/migrations/writer.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os
 import re
 from importlib import import_module
@@ -294,9 +292,7 @@ def serialize(cls, value):


 MIGRATION_TEMPLATE = """\
-# -*- coding: utf-8 -*-
 # Generated by Django %(version)s on %(timestamp)s
-from __future__ import unicode_literals

 %(imports)s

diff --git a/django/db/models/base.py b/django/db/models/base.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import copy
 import inspect
 import warnings
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import collections
 import copy
 import datetime
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import inspect
 from functools import partial

diff --git a/django/db/models/fields/related_descriptors.py b/django/db/models/fields/related_descriptors.py
@@ -63,8 +63,6 @@ class Child(Model):
   ``ReverseManyToManyDescriptor``, use ``ManyToManyDescriptor`` instead.
 """

-from __future__ import unicode_literals
-
 from operator import attrgetter

 from django.db import connections, router, transaction
diff --git a/django/db/models/fields/reverse_related.py b/django/db/models/fields/reverse_related.py
@@ -9,8 +9,6 @@
 they're the closest concept currently available.
 """

-from __future__ import unicode_literals
-
 from django.core import exceptions
 from django.utils.encoding import force_text
 from django.utils.functional import cached_property
diff --git a/django/db/models/functions/datetime.py b/django/db/models/functions/datetime.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from datetime import datetime

 from django.conf import settings
diff --git a/django/db/models/indexes.py b/django/db/models/indexes.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import hashlib

 from django.utils.encoding import force_bytes
diff --git a/django/db/models/options.py b/django/db/models/options.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import copy
 import warnings
 from bisect import bisect
diff --git a/django/db/models/query_utils.py b/django/db/models/query_utils.py
@@ -5,8 +5,6 @@
 large and/or so that they can be used by other modules without getting into
 circular import difficulties.
 """
-from __future__ import unicode_literals
-
 import inspect
 from collections import namedtuple

diff --git a/django/forms/boundfield.py b/django/forms/boundfield.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime
 import warnings

diff --git a/django/forms/fields.py b/django/forms/fields.py
@@ -2,8 +2,6 @@
 Field classes.
 """

-from __future__ import unicode_literals
-
 import copy
 import datetime
 import itertools
diff --git a/django/forms/forms.py b/django/forms/forms.py
@@ -2,8 +2,6 @@
 Form classes
 """

-from __future__ import unicode_literals
-
 import copy
 from collections import OrderedDict

diff --git a/django/forms/formsets.py b/django/forms/formsets.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.core.exceptions import ValidationError
 from django.forms import Form
 from django.forms.fields import BooleanField, IntegerField
diff --git a/django/forms/models.py b/django/forms/models.py
@@ -3,8 +3,6 @@
 and database field objects.
 """

-from __future__ import unicode_literals
-
 from collections import OrderedDict
 from itertools import chain

diff --git a/django/forms/utils.py b/django/forms/utils.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import json
 import sys

diff --git a/django/forms/widgets.py b/django/forms/widgets.py
@@ -2,8 +2,6 @@
 HTML Widget classes
 """

-from __future__ import unicode_literals
-
 import copy
 import datetime
 import re
diff --git a/django/http/cookie.py b/django/http/cookie.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import sys

 from django.utils import six
diff --git a/django/http/multipartparser.py b/django/http/multipartparser.py
@@ -4,8 +4,6 @@
 Exposes one class, ``MultiPartParser``, which feeds chunks of uploaded data to
 file upload handlers for processing.
 """
-from __future__ import unicode_literals
-
 import base64
 import binascii
 import cgi
diff --git a/django/http/request.py b/django/http/request.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import copy
 import re
 import sys
diff --git a/django/http/response.py b/django/http/response.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime
 import json
 import re
diff --git a/django/middleware/csrf.py b/django/middleware/csrf.py
@@ -4,8 +4,6 @@
 This module provides a middleware that implements protection
 against request forgeries from other sites.
 """
-from __future__ import unicode_literals
-
 import logging
 import re
 import string
diff --git a/django/template/backends/base.py b/django/template/backends/base.py
@@ -1,6 +1,3 @@
-# Since this package contains a "django" module, this is required on Python 2.
-from __future__ import absolute_import
-
 from django.core.exceptions import (
    ImproperlyConfigured, SuspiciousFileOperation,
 )
diff --git a/django/template/backends/django.py b/django/template/backends/django.py
@@ -1,6 +1,3 @@
-# Since this package contains a "django" module, this is required on Python 2.
-from __future__ import absolute_import
-
 import sys
 from importlib import import_module
 from pkgutil import walk_packages
diff --git a/django/template/backends/dummy.py b/django/template/backends/dummy.py
@@ -1,6 +1,3 @@
-# Since this package contains a "django" module, this is required on Python 2.
-from __future__ import absolute_import
-
 import errno
 import io
 import string
diff --git a/django/template/backends/jinja2.py b/django/template/backends/jinja2.py
@@ -1,6 +1,3 @@
-# Since this package contains a "django" module, this is required on Python 2.
-from __future__ import absolute_import
-
 import sys

 import jinja2
diff --git a/django/template/backends/utils.py b/django/template/backends/utils.py
@@ -1,6 +1,3 @@
-# Since this package contains a "django" module, this is required on Python 2.
-from __future__ import absolute_import
-
 from django.middleware.csrf import get_token
 from django.utils.functional import lazy
 from django.utils.html import format_html
diff --git a/django/template/base.py b/django/template/base.py
@@ -49,8 +49,6 @@
 '<html></html>'
 """

-from __future__ import unicode_literals
-
 import inspect
 import logging
 import re
diff --git a/django/template/context_processors.py b/django/template/context_processors.py
@@ -7,8 +7,6 @@
 of a DjangoTemplates backend and used by RequestContext.
 """

-from __future__ import unicode_literals
-
 import itertools

 from django.conf import settings
diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py
@@ -1,6 +1,4 @@
 """Default variable filters."""
-from __future__ import unicode_literals
-
 import random as random_module
 import re
 from decimal import ROUND_HALF_UP, Context, Decimal, InvalidOperation
diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
@@ -1,6 +1,4 @@
 """Default tags used by the template system, available to all templates."""
-from __future__ import unicode_literals
-
 import re
 import sys
 import warnings
diff --git a/django/templatetags/cache.py b/django/templatetags/cache.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.core.cache import InvalidCacheBackendError, caches
 from django.core.cache.utils import make_template_fragment_key
 from django.template import (
diff --git a/django/templatetags/i18n.py b/django/templatetags/i18n.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import sys

 from django.conf import settings
diff --git a/django/test/client.py b/django/test/client.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import json
 import mimetypes
 import os
diff --git a/django/test/html.py b/django/test/html.py
@@ -2,8 +2,6 @@
 Comparing two html documents.
 """

-from __future__ import unicode_literals
-
 import re

 from django.utils import six
diff --git a/django/test/selenium.py b/django/test/selenium.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import sys
 import unittest
 from contextlib import contextmanager
diff --git a/django/test/testcases.py b/django/test/testcases.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import difflib
 import json
 import posixpath
diff --git a/django/urls/base.py b/django/urls/base.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from threading import local

 from django.utils import six
diff --git a/django/urls/exceptions.py b/django/urls/exceptions.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.http import Http404


diff --git a/django/urls/resolvers.py b/django/urls/resolvers.py
@@ -5,8 +5,6 @@
 a string) and returns a ResolverMatch object which provides access to all
 attributes of the resolved URL match.
 """
-from __future__ import unicode_literals
-
 import functools
 import re
 import threading
diff --git a/django/urls/utils.py b/django/urls/utils.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from importlib import import_module

 from django.core.exceptions import ViewDoesNotExist
diff --git a/django/utils/_os.py b/django/utils/_os.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os
 import sys
 import tempfile
diff --git a/django/utils/cache.py b/django/utils/cache.py
@@ -16,8 +16,6 @@
 An example: i18n middleware would need to distinguish caches by the
 "Accept-language" header.
 """
-from __future__ import unicode_literals
-
 import hashlib
 import logging
 import re
diff --git a/django/utils/crypto.py b/django/utils/crypto.py
@@ -1,8 +1,6 @@
 """
 Django's standard crypto functions and utilities.
 """
-from __future__ import unicode_literals
-
 import binascii
 import hashlib
 import hmac
diff --git a/django/utils/dateformat.py b/django/utils/dateformat.py
@@ -10,8 +10,6 @@
 7th October 2003 11:39
 >>>
 """
-from __future__ import unicode_literals
-
 import calendar
 import datetime
 import re
diff --git a/django/utils/deprecation.py b/django/utils/deprecation.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import inspect
 import warnings

diff --git a/django/utils/encoding.py b/django/utils/encoding.py
@@ -1,6 +1,3 @@
-# -*- encoding: utf-8 -*-
-from __future__ import unicode_literals
-
 import codecs
 import datetime
 import locale
diff --git a/django/utils/feedgenerator.py b/django/utils/feedgenerator.py
@@ -21,8 +21,6 @@
 For definitions of the different versions of RSS, see:
 http://web.archive.org/web/20110718035220/http://diveintomark.org/archives/2004/02/04/incompatible-rss
 """
-from __future__ import unicode_literals
-
 import datetime

 from django.utils import datetime_safe, six
diff --git a/django/utils/glob.py b/django/utils/glob.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os.path
 import re

diff --git a/django/utils/html.py b/django/utils/html.py
@@ -1,7 +1,5 @@
 """HTML utilities suitable for global use."""

-from __future__ import unicode_literals
-
 import re

 from django.utils import six
diff --git a/django/utils/http.py b/django/utils/http.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import base64
 import calendar
 import datetime
diff --git a/django/utils/inspect.py b/django/utils/inspect.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import inspect

 from django.utils import six
diff --git a/django/utils/jslex.py b/django/utils/jslex.py
@@ -1,7 +1,5 @@
 """JsLex: a lexer for Javascript"""
 # Originally from https://bitbucket.org/ned/jslex
-from __future__ import unicode_literals
-
 import re


diff --git a/django/utils/log.py b/django/utils/log.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import logging
 import logging.config  # needed when logging_config doesn't start with logging.config
 from copy import copy
diff --git a/django/utils/lorem_ipsum.py b/django/utils/lorem_ipsum.py
@@ -2,8 +2,6 @@
 Utility functions for generating "lorem ipsum" Latin text.
 """

-from __future__ import unicode_literals
-
 import random

 COMMON_P = (
diff --git a/django/utils/numberformat.py b/django/utils/numberformat.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from decimal import Decimal

 from django.conf import settings
diff --git a/django/utils/regex_helper.py b/django/utils/regex_helper.py
@@ -5,8 +5,6 @@
 This is not, and is not intended to be, a complete reg-exp decompiler. It
 should be good enough for a large class of URLS, however.
 """
-from __future__ import unicode_literals
-
 import warnings

 from django.utils import six
diff --git a/django/utils/six.py b/django/utils/six.py
@@ -20,8 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.

-from __future__ import absolute_import
-
 import functools
 import itertools
 import operator
diff --git a/django/utils/text.py b/django/utils/text.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import re
 import unicodedata
 from gzip import GzipFile
diff --git a/django/utils/timesince.py b/django/utils/timesince.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import calendar
 import datetime

diff --git a/django/utils/translation/__init__.py b/django/utils/translation/__init__.py
@@ -1,8 +1,6 @@
 """
 Internationalization support.
 """
-from __future__ import unicode_literals
-
 import re
 import warnings

diff --git a/django/utils/translation/template.py b/django/utils/translation/template.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import re
 import warnings

diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py
@@ -1,6 +1,4 @@
 """Translation helper functions."""
-from __future__ import unicode_literals
-
 import gettext as gettext_module
 import os
 import re
diff --git a/django/utils/version.py b/django/utils/version.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime
 import os
 import subprocess
diff --git a/django/views/debug.py b/django/views/debug.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import re
 import sys
 import types
diff --git a/django/views/generic/base.py b/django/views/generic/base.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import logging
 from functools import update_wrapper

diff --git a/django/views/generic/dates.py b/django/views/generic/dates.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime

 from django.conf import settings
diff --git a/django/views/generic/detail.py b/django/views/generic/detail.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
 from django.http import Http404
diff --git a/django/views/generic/list.py b/django/views/generic/list.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.core.exceptions import ImproperlyConfigured
 from django.core.paginator import InvalidPage, Paginator
 from django.db.models.query import QuerySet
diff --git a/django/views/static.py b/django/views/static.py
@@ -2,8 +2,6 @@
 Views and functions for serving static files. These are only to be used
 during development, and SHOULD NOT be used in a production setting.
 """
-from __future__ import unicode_literals
-
 import mimetypes
 import os
 import posixpath
diff --git a/docs/conf.py b/docs/conf.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # Django documentation build configuration file, created by
 # sphinx-quickstart on Thu Mar 27 09:06:53 2008.
 #
@@ -11,8 +9,6 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.

-from __future__ import unicode_literals
-
 import sys
 from os.path import abspath, dirname, join

diff --git a/docs/howto/writing-migrations.txt b/docs/howto/writing-migrations.txt
@@ -100,10 +100,7 @@ the respective field according to your needs.
  .. snippet::
    :filename: 0006_remove_uuid_null.py

-    # -*- coding: utf-8 -*-
    # Generated by Django A.B on YYYY-MM-DD HH:MM
-    from __future__ import unicode_literals
-
    from django.db import migrations, models
    import uuid

@@ -154,10 +151,7 @@ the respective field according to your needs.
  .. snippet::
    :filename: 0005_populate_uuid_values.py

-    # -*- coding: utf-8 -*-
    # Generated by Django A.B on YYYY-MM-DD HH:MM
-    from __future__ import unicode_literals
-
    from django.db import migrations, models
    import uuid

diff --git a/docs/ref/files/file.txt b/docs/ref/files/file.txt
@@ -111,7 +111,6 @@ The ``ContentFile`` class
    but unlike :class:`~django.core.files.File` it operates on string content
    (bytes also supported), rather than an actual file. For example::

-        from __future__ import unicode_literals
        from django.core.files.base import ContentFile

        f1 = ContentFile("esta sentencia está en español")
diff --git a/docs/ref/migration-operations.txt b/docs/ref/migration-operations.txt
@@ -310,9 +310,6 @@ class in the migration file, and just pass it to ``RunPython``. Here's an
 example of using ``RunPython`` to create some initial objects on a ``Country``
 model::

-    # -*- coding: utf-8 -*-
-    from __future__ import unicode_literals
-
    from django.db import migrations, models

    def forwards_func(apps, schema_editor):
diff --git a/docs/topics/i18n/formatting.txt b/docs/topics/i18n/formatting.txt
@@ -177,8 +177,6 @@ To customize the English formats, a structure like this would be needed::

 where :file:`formats.py` contains custom format definitions. For example::

-    from __future__ import unicode_literals
-
    THOUSAND_SEPARATOR = '\xa0'

 to use a non-breaking space (Unicode ``00A0``) as a thousand separator,
diff --git a/docs/topics/migrations.txt b/docs/topics/migrations.txt
@@ -454,10 +454,7 @@ the file in the right place, suggest a name, and add dependencies for you)::

 Then, open up the file; it should look something like this::

-    # -*- coding: utf-8 -*-
    # Generated by Django A.B on YYYY-MM-DD HH:MM
-    from __future__ import unicode_literals
-
    from django.db import migrations, models

    class Migration(migrations.Migration):
@@ -485,9 +482,6 @@ combined values of ``first_name`` and ``last_name`` (we've come to our senses
 and realized that not everyone has first and last names). All we
 need to do is use the historical model and iterate over the rows::

-    # -*- coding: utf-8 -*-
-    from __future__ import unicode_literals
-
    from django.db import migrations, models

    def combine_names(apps, schema_editor):
@@ -757,26 +751,6 @@ The decorator adds logic to capture and preserve the arguments on their
 way into your constructor, and then returns those arguments exactly when
 deconstruct() is called.

-Supporting Python 2 and 3
-=========================
-
-In order to generate migrations that support both Python 2 and 3, all string
-literals used in your models and fields (e.g. ``verbose_name``,
-``related_name``, etc.), must be consistently either bytestrings or text
-(unicode) strings in both Python 2 and 3 (rather than bytes in Python 2 and
-text in Python 3, the default situation for unmarked string literals.)
-Otherwise running :djadmin:`makemigrations` under Python 3 will generate
-spurious new migrations to convert all these string attributes to text.
-
-The easiest way to achieve this is to follow the advice in Django's
-:doc:`Python 3 porting guide </topics/python3>` and make sure that all your
-modules begin with ``from __future__ import unicode_literals``, so that all
-unmarked string literals are always unicode, regardless of Python version. When
-you add this to an app with existing migrations generated on Python 2, your
-next run of :djadmin:`makemigrations` on Python 3 will likely generate many
-changes as it converts all the bytestring attributes to text strings; this is
-normal and should only happen once.
-
 Supporting multiple Django versions
 ===================================

diff --git a/docs/topics/templates.txt b/docs/topics/templates.txt
@@ -422,8 +422,6 @@ environment.

 For example, you can create ``myproject/jinja2.py`` with this content::

-    from __future__ import absolute_import  # Python 2 only
-
    from django.contrib.staticfiles.storage import staticfiles_storage
    from django.urls import reverse

diff --git a/tests/admin_changelist/tests.py b/tests/admin_changelist/tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime

 from django.contrib import admin
diff --git a/tests/admin_checks/tests.py b/tests/admin_checks/tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django import forms
 from django.contrib import admin
 from django.contrib.admin import AdminSite
diff --git a/tests/admin_custom_urls/tests.py b/tests/admin_custom_urls/tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.admin.utils import quote
 from django.contrib.auth.models import User
 from django.template.response import TemplateResponse
diff --git a/tests/admin_docs/test_middleware.py b/tests/admin_docs/test_middleware.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.auth.models import User

 from .tests import AdminDocsTestCase, TestDataMixin
diff --git a/tests/admin_docs/test_utils.py b/tests/admin_docs/test_utils.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import unittest

 from django.contrib.admindocs.utils import (
diff --git a/tests/admin_docs/test_views.py b/tests/admin_docs/test_views.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import sys
 import unittest

diff --git a/tests/admin_docs/tests.py b/tests/admin_docs/tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.auth.models import User
 from django.test import TestCase, modify_settings, override_settings

diff --git a/tests/admin_filters/models.py b/tests/admin_filters/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.fields import (
    GenericForeignKey, GenericRelation,
diff --git a/tests/admin_filters/tests.py b/tests/admin_filters/tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime
 import sys
 import unittest
diff --git a/tests/admin_inlines/models.py b/tests/admin_inlines/models.py
@@ -1,9 +1,6 @@
 """
 Testing of admin inline formsets.
-
 """
-from __future__ import unicode_literals
-
 import random

 from django.contrib.contenttypes.fields import GenericForeignKey
diff --git a/tests/admin_inlines/test_templates.py b/tests/admin_inlines/test_templates.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import json

 from django.template.loader import render_to_string
diff --git a/tests/admin_inlines/tests.py b/tests/admin_inlines/tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.admin import ModelAdmin, TabularInline
 from django.contrib.admin.helpers import InlineAdminForm
 from django.contrib.admin.tests import AdminSeleniumTestCase
diff --git a/tests/admin_ordering/models.py b/tests/admin_ordering/models.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.contrib import admin
 from django.db import models

diff --git a/tests/admin_ordering/tests.py b/tests/admin_ordering/tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib import admin
 from django.contrib.admin.options import ModelAdmin
 from django.contrib.auth.models import User
diff --git a/tests/admin_registration/tests.py b/tests/admin_registration/tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib import admin
 from django.contrib.admin.decorators import register
 from django.contrib.admin.sites import site
diff --git a/tests/admin_scripts/another_app_waiting_migration/migrations/0001_initial.py b/tests/admin_scripts/another_app_waiting_migration/migrations/0001_initial.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db import migrations, models


diff --git a/tests/admin_scripts/another_app_waiting_migration/models.py b/tests/admin_scripts/another_app_waiting_migration/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db import models


diff --git a/tests/admin_scripts/app_raising_messages/models.py b/tests/admin_scripts/app_raising_messages/models.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.core import checks
 from django.db import models

diff --git a/tests/admin_scripts/app_raising_warning/models.py b/tests/admin_scripts/app_raising_warning/models.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.core import checks
 from django.db import models

diff --git a/tests/admin_scripts/app_waiting_migration/migrations/0001_initial.py b/tests/admin_scripts/app_waiting_migration/migrations/0001_initial.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db import migrations, models


diff --git a/tests/admin_scripts/app_waiting_migration/models.py b/tests/admin_scripts/app_waiting_migration/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db import models


diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py
@@ -1,11 +1,8 @@
-# -*- coding: utf-8 -*-
 """
 A series of tests to establish that the command-line management tools work as
 advertised - especially with regards to the handling of the
 DJANGO_SETTINGS_MODULE and default settings.py files.
 """
-from __future__ import unicode_literals
-
 import codecs
 import os
 import re
@@ -30,7 +27,7 @@
 )
 from django.utils._os import npath, upath
 from django.utils.encoding import force_text
-from django.utils.six import PY2, PY3, StringIO
+from django.utils.six import PY2, StringIO

 custom_templates_dir = os.path.join(os.path.dirname(upath(__file__)), 'custom_templates')

@@ -67,7 +64,6 @@ def write_settings(self, filename, apps=None, is_dir=False, sdict=None, extra=No
            settings_file_path = os.path.join(self.test_dir, filename)

        with open(settings_file_path, 'w') as settings_file:
-            settings_file.write('# -*- coding: utf-8 -*\n')
            settings_file.write('# Settings file automatically generated by admin_scripts test case\n')
            if extra:
                settings_file.write("%s\n" % extra)
@@ -614,26 +610,10 @@ def test_setup_environ(self):
        self.addCleanup(shutil.rmtree, app_path)
        self.assertNoOutput(err)
        self.assertTrue(os.path.exists(app_path))
-        unicode_literals_import = "# -*- coding: utf-8 -*-\nfrom __future__ import unicode_literals\n\n"
        with open(os.path.join(app_path, 'apps.py'), 'r') as f:
            content = f.read()
            self.assertIn("class SettingsTestConfig(AppConfig)", content)
            self.assertIn("name = 'settings_test'", content)
-            if not PY3:
-                self.assertIn(unicode_literals_import, content)
-        if not PY3:
-            with open(os.path.join(app_path, 'models.py'), 'r') as fp:
-                content = fp.read()
-            self.assertIn(unicode_literals_import, content)
-            with open(os.path.join(app_path, 'views.py'), 'r') as fp:
-                content = fp.read()
-            self.assertIn(unicode_literals_import, content)
-            with open(os.path.join(app_path, 'admin.py'), 'r') as fp:
-                content = fp.read()
-            self.assertIn(unicode_literals_import, content)
-            with open(os.path.join(app_path, 'tests.py'), 'r') as fp:
-                content = fp.read()
-            self.assertIn(unicode_literals_import, content)

    def test_setup_environ_custom_template(self):
        "directory: startapp creates the correct directory with a custom template"
diff --git a/tests/admin_utils/test_logentry.py b/tests/admin_utils/test_logentry.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import json
 from datetime import datetime

diff --git a/tests/admin_utils/tests.py b/tests/admin_utils/tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from datetime import datetime
 from decimal import Decimal

diff --git a/tests/admin_views/admin.py b/tests/admin_views/admin.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import os
 import tempfile
 from wsgiref.util import FileWrapper
diff --git a/tests/admin_views/custom_has_permission_admin.py b/tests/admin_views/custom_has_permission_admin.py
@@ -1,8 +1,6 @@
 """
 A custom AdminSite for AdminViewPermissionsTest.test_login_has_permission().
 """
-from __future__ import unicode_literals
-
 from django.contrib import admin
 from django.contrib.auth import get_permission_codename
 from django.contrib.auth.forms import AuthenticationForm
diff --git a/tests/admin_views/customadmin.py b/tests/admin_views/customadmin.py
@@ -1,8 +1,6 @@
 """
 A second, custom AdminSite -- see tests.CustomAdminSiteTests.
 """
-from __future__ import unicode_literals
-
 from django.conf.urls import url
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
diff --git a/tests/admin_views/models.py b/tests/admin_views/models.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import datetime
 import os
 import tempfile
diff --git a/tests/admin_views/test_adminsite.py b/tests/admin_views/test_adminsite.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.conf.urls import url
 from django.contrib import admin
 from django.contrib.auth.models import User
diff --git a/tests/admin_views/test_templatetags.py b/tests/admin_views/test_templatetags.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.admin.templatetags.admin_modify import submit_row
 from django.contrib.auth.admin import UserAdmin
 from django.contrib.auth.models import User
diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import datetime
 import json
 import os
diff --git a/tests/admin_widgets/models.py b/tests/admin_widgets/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.auth.models import User
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import gettext
 import os
 import re
diff --git a/tests/aggregation/models.py b/tests/aggregation/models.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible

diff --git a/tests/aggregation/tests.py b/tests/aggregation/tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime
 import re
 from decimal import Decimal
diff --git a/tests/aggregation_regress/models.py b/tests/aggregation_regress/models.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.contrib.contenttypes.fields import (
    GenericForeignKey, GenericRelation,
 )
diff --git a/tests/aggregation_regress/tests.py b/tests/aggregation_regress/tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime
 import pickle
 from decimal import Decimal
diff --git a/tests/annotations/models.py b/tests/annotations/models.py
@@ -1,4 +1,3 @@
-# coding: utf-8
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible

diff --git a/tests/annotations/tests.py b/tests/annotations/tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime
 from decimal import Decimal

diff --git a/tests/app_loading/tests.py b/tests/app_loading/tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os

 from django.apps import apps
diff --git a/tests/apps/apps.py b/tests/apps/apps.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.apps import AppConfig


diff --git a/tests/apps/models.py b/tests/apps/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.apps.registry import Apps
 from django.db import models

diff --git a/tests/apps/tests.py b/tests/apps/tests.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os
 from unittest import skipUnless

diff --git a/tests/auth_tests/test_auth_backends.py b/tests/auth_tests/test_auth_backends.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from datetime import date

 from django.contrib.auth import (
diff --git a/tests/auth_tests/test_basic.py b/tests/auth_tests/test_basic.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.contrib.auth import get_user, get_user_model
 from django.contrib.auth.models import AnonymousUser, User
 from django.core.exceptions import ImproperlyConfigured
diff --git a/tests/auth_tests/test_checks.py b/tests/auth_tests/test_checks.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.auth.checks import (
    check_models_permissions, check_user_model,
 )
diff --git a/tests/auth_tests/test_deprecated_views.py b/tests/auth_tests/test_deprecated_views.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import datetime
 import itertools
 import re
diff --git a/tests/auth_tests/test_forms.py b/tests/auth_tests/test_forms.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import datetime
 import re
 from unittest import skipIf
diff --git a/tests/auth_tests/test_handlers.py b/tests/auth_tests/test_handlers.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.auth.handlers.modwsgi import (
    check_password, groups_for_user,
 )
diff --git a/tests/auth_tests/test_hashers.py b/tests/auth_tests/test_hashers.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from unittest import skipUnless

 from django.conf.global_settings import PASSWORD_HASHERS
diff --git a/tests/auth_tests/test_management.py b/tests/auth_tests/test_management.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import sys
 from datetime import date

diff --git a/tests/auth_tests/test_models.py b/tests/auth_tests/test_models.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.conf.global_settings import PASSWORD_HASHERS
 from django.contrib.auth import get_user_model
 from django.contrib.auth.base_user import AbstractBaseUser
diff --git a/tests/auth_tests/test_validators.py b/tests/auth_tests/test_validators.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import os

 from django.contrib.auth import validators
diff --git a/tests/auth_tests/test_views.py b/tests/auth_tests/test_views.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import datetime
 import itertools
 import os
diff --git a/tests/backends/models.py b/tests/backends/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.contenttypes.fields import (
    GenericForeignKey, GenericRelation,
 )
diff --git a/tests/backends/test_mysql.py b/tests/backends/test_mysql.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import unittest

 from django.core.exceptions import ImproperlyConfigured
diff --git a/tests/backends/tests.py b/tests/backends/tests.py
@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 # Unit and doctests for specific database backends.
-from __future__ import unicode_literals
-
 import datetime
 import re
 import threading
diff --git a/tests/base/models.py b/tests/base/models.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db import models
 from django.utils import six