diff options
| author | Claude Paroz <claude@2xlibre.net> | 2016-11-19 18:19:41 +0100 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2017-01-18 09:55:19 +0100 |
| commit | d7b9aaa366dd54ecc3142c588162e3adc7c2f7ac (patch) | |
| tree | c7faf11a6f6c14981a08a621c36e6f736b21dd8b /tests | |
| parent | 397b3705c5f762b359cdb494f9447c8a60685adf (diff) | |
| download | django-d7b9aaa366dd54ecc3142c588162e3adc7c2f7ac.tar.gz | |
Refs #23919 -- Removed encoding preambles and future imports
Diffstat (limited to 'tests')
543 files changed, 1 insertions, 1347 deletions
diff --git a/tests/admin_changelist/tests.py b/tests/admin_changelist/tests.py index 2f0f6ad46b..48e7460314 100644 --- 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 index 3d629077c5..e8714fe1a8 100644 --- 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 index 319e6f6653..e0c2d4f746 100644 --- 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 index 426c78d58f..8a818e15d1 100644 --- 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 index 013d003914..0c738e5e89 100644 --- 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 index b48147fc85..9f7f0ee268 100644 --- 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 index c376a4cf5e..2a2f9d25e0 100644 --- 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 index 8860201d35..f508aa1f9b 100644 --- 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 index e2da7ec59e..0df02708a8 100644 --- 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 index 15297c521f..e78511aaab 100644 --- 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 index 236ec5df7b..5c8d7ce0c1 100644 --- 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 index 6922a9f82f..6deba9b1c2 100644 --- 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 index cd26f2a710..b8098b9bcc 100644 --- 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 index def9b8b7c7..250b59dea8 100644 --- 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 index db38265182..125d8eae61 100644 --- 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 index 1486231d6b..d5fce1af36 100644 --- 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 index 6c12c6ab5d..c089cb64e6 100644 --- 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 index bd37ba458a..400fc8f907 100644 --- 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 index 0ae3042634..bc9b3b380f 100644 --- 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 index 52d594a94a..aa47c4d474 100644 --- 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 index 5e9f0e3314..46fee9c857 100644 --- 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 index af3ada5bcc..08fe645535 100644 --- 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.test import ( ) 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 @@ class AdminScriptTestCase(unittest.TestCase): 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 @@ class DjangoAdminSettingsDirectory(AdminScriptTestCase): 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 index ba0e3c1bfd..89b25f462b 100644 --- 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 index 966a1f11f2..245334df4d 100644 --- 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 index d85f5de059..b8d35b6d81 100644 --- 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 index a578895b5a..0c774ef573 100644 --- 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 index 644bbedae7..5eb1f2baa2 100644 --- 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 index 86ab055f30..54d8f5f968 100644 --- 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 index 7077d4be58..0885615353 100644 --- 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 index a62c1caf89..19a6450be8 100644 --- 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 index a724d57559..2353a9ee7a 100644 --- 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 index 274c36e15e..43aa88e254 100644 --- 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 index b74df4e251..8eadab07d5 100644 --- 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 index 9d47946418..37421dbb81 100644 --- 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 index 4711869cfd..25a1e00827 100644 --- 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 index e606beb304..a9ab1cbdce 100644 --- 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 index 2958736fe9..afbc7c20b2 100644 --- 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 index a92ca0b43a..79648ffd96 100644 --- 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 index b90286b9da..bffac69e21 100644 --- 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 index a79bdaec04..021e711796 100644 --- 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 index 7faa63e435..1096c1e4b8 100644 --- 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 index 733be35d2e..f5f5926ea6 100644 --- 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 index a0f7ecbb10..d2adc681f2 100644 --- 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 index 080270296b..f06e825698 100644 --- 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 index 4555e28270..b2c70faffb 100644 --- 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 index 8dca3159d1..3f86e7a80e 100644 --- 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 index 542833686a..d084f4dcef 100644 --- 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 index cc77288f56..36b4e8f4e7 100644 --- 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 index 0e2a42b80a..57a43f877f 100644 --- 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 index 5a8e44bcd7..4b6aa8f799 100644 --- 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 index 976b318c74..eaceafb444 100644 --- 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 index bd64949501..ebe3dc0837 100644 --- 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 index e074716f46..19d75c8d30 100644 --- 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 index 2d0d2ae96f..f250800921 100644 --- 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 index e57206ec60..18423e1276 100644 --- 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 index db8aff12d0..d7030975f6 100644 --- 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 index e17679a4ba..7a102b040a 100644 --- 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 index 4a8a2ffd81..077b93fbb8 100644 --- 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 diff --git a/tests/basic/models.py b/tests/basic/models.py index 91fbe7d648..a6010f1291 100644 --- a/tests/basic/models.py +++ b/tests/basic/models.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Bare-bones model diff --git a/tests/basic/tests.py b/tests/basic/tests.py index dd7570c5b9..544a862766 100644 --- a/tests/basic/tests.py +++ b/tests/basic/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import threading from datetime import datetime, timedelta diff --git a/tests/builtin_server/tests.py b/tests/builtin_server/tests.py index 14253f70a4..2784571b0c 100644 --- a/tests/builtin_server/tests.py +++ b/tests/builtin_server/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import sys import traceback from io import BytesIO diff --git a/tests/bulk_create/tests.py b/tests/bulk_create/tests.py index 3378f0010a..65d0f9ba8c 100644 --- a/tests/bulk_create/tests.py +++ b/tests/bulk_create/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from operator import attrgetter from django.db import connection diff --git a/tests/cache/tests.py b/tests/cache/tests.py index edf25cfc65..5be3db0ef4 100644 --- a/tests/cache/tests.py +++ b/tests/cache/tests.py @@ -1,9 +1,5 @@ -# -*- coding: utf-8 -*- - # Unit tests for cache framework # Uses whatever cache backend is set in the test settings file. -from __future__ import unicode_literals - import copy import io import os diff --git a/tests/check_framework/models.py b/tests/check_framework/models.py index fe573fce84..f13010cc57 100644 --- a/tests/check_framework/models.py +++ b/tests/check_framework/models.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.core.checks import register from django.db import models diff --git a/tests/check_framework/tests.py b/tests/check_framework/tests.py index a64ef206ad..0e82c10b45 100644 --- a/tests/check_framework/tests.py +++ b/tests/check_framework/tests.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import sys from django.apps import apps diff --git a/tests/conditional_processing/tests.py b/tests/conditional_processing/tests.py index e4af9447e0..fd0b10cef4 100644 --- a/tests/conditional_processing/tests.py +++ b/tests/conditional_processing/tests.py @@ -1,6 +1,3 @@ -# -*- coding:utf-8 -*- -from __future__ import unicode_literals - from datetime import datetime from django.test import SimpleTestCase, override_settings diff --git a/tests/contenttypes_tests/models.py b/tests/contenttypes_tests/models.py index fe1854e8a3..1640ee3b8c 100644 --- a/tests/contenttypes_tests/models.py +++ b/tests/contenttypes_tests/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.contenttypes.fields import ( GenericForeignKey, GenericRelation, ) diff --git a/tests/contenttypes_tests/operations_migrations/0001_initial.py b/tests/contenttypes_tests/operations_migrations/0001_initial.py index f08a6a8186..9d43117529 100644 --- a/tests/contenttypes_tests/operations_migrations/0001_initial.py +++ b/tests/contenttypes_tests/operations_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/tests/contenttypes_tests/operations_migrations/0002_rename_foo.py b/tests/contenttypes_tests/operations_migrations/0002_rename_foo.py index 34c8cd8a80..3a1527dc03 100644 --- a/tests/contenttypes_tests/operations_migrations/0002_rename_foo.py +++ b/tests/contenttypes_tests/operations_migrations/0002_rename_foo.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/contenttypes_tests/test_models.py b/tests/contenttypes_tests/test_models.py index a51a343c83..bb0f8c890f 100644 --- a/tests/contenttypes_tests/test_models.py +++ b/tests/contenttypes_tests/test_models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.contenttypes.models import ContentType, ContentTypeManager from django.contrib.contenttypes.views import shortcut from django.contrib.sites.shortcuts import get_current_site diff --git a/tests/contenttypes_tests/tests.py b/tests/contenttypes_tests/tests.py index 95ec5e5e2b..a46c9f3365 100644 --- a/tests/contenttypes_tests/tests.py +++ b/tests/contenttypes_tests/tests.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import datetime from django.apps.registry import Apps, apps diff --git a/tests/contenttypes_tests/urls.py b/tests/contenttypes_tests/urls.py index 285a5a2068..779e8c4a60 100644 --- a/tests/contenttypes_tests/urls.py +++ b/tests/contenttypes_tests/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf.urls import url from django.contrib.contenttypes import views diff --git a/tests/csrf_tests/tests.py b/tests/csrf_tests/tests.py index 4480f5348e..33f30a8353 100644 --- a/tests/csrf_tests/tests.py +++ b/tests/csrf_tests/tests.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import logging import re import warnings diff --git a/tests/csrf_tests/views.py b/tests/csrf_tests/views.py index e41f2d0805..d436ae6f73 100644 --- a/tests/csrf_tests/views.py +++ b/tests/csrf_tests/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.http import HttpResponse from django.template import RequestContext, Template from django.template.context_processors import csrf diff --git a/tests/custom_columns/models.py b/tests/custom_columns/models.py index 3f619a7f04..d5f5217ba5 100644 --- a/tests/custom_columns/models.py +++ b/tests/custom_columns/models.py @@ -15,8 +15,6 @@ from the default generated name, use the ``db_table`` parameter on the """ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/custom_columns/tests.py b/tests/custom_columns/tests.py index 7102e4fdbe..04aca12914 100644 --- a/tests/custom_columns/tests.py +++ b/tests/custom_columns/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.exceptions import FieldError from django.test import TestCase from django.utils import six diff --git a/tests/custom_lookups/tests.py b/tests/custom_lookups/tests.py index 8ae94dda26..e66a280e16 100644 --- a/tests/custom_lookups/tests.py +++ b/tests/custom_lookups/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import contextlib import time import unittest diff --git a/tests/custom_managers/models.py b/tests/custom_managers/models.py index 51773b18b8..1d47869af9 100644 --- a/tests/custom_managers/models.py +++ b/tests/custom_managers/models.py @@ -9,8 +9,6 @@ There are two reasons you might want to customize a ``Manager``: to add extra returns. """ -from __future__ import unicode_literals - from django.contrib.contenttypes.fields import ( GenericForeignKey, GenericRelation, ) diff --git a/tests/custom_managers/tests.py b/tests/custom_managers/tests.py index 3daaeab131..1bfaf52766 100644 --- a/tests/custom_managers/tests.py +++ b/tests/custom_managers/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import models from django.test import TestCase from django.utils import six diff --git a/tests/custom_methods/tests.py b/tests/custom_methods/tests.py index 9186a41794..bbcec1f9f2 100644 --- a/tests/custom_methods/tests.py +++ b/tests/custom_methods/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from datetime import date from django.test import TestCase diff --git a/tests/custom_pk/models.py b/tests/custom_pk/models.py index 20b484c426..e0a318468c 100644 --- a/tests/custom_pk/models.py +++ b/tests/custom_pk/models.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Using a custom primary key @@ -6,8 +5,6 @@ By default, Django adds an ``"id"`` field to each model. But you can override this behavior by explicitly adding ``primary_key=True`` to a field. """ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/custom_pk/tests.py b/tests/custom_pk/tests.py index fdcbd80e04..01150a46d2 100644 --- a/tests/custom_pk/tests.py +++ b/tests/custom_pk/tests.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import IntegrityError, transaction from django.test import TestCase, skipIfDBFeature from django.utils import six diff --git a/tests/datatypes/tests.py b/tests/datatypes/tests.py index f45c429ef2..b6899c7609 100644 --- a/tests/datatypes/tests.py +++ b/tests/datatypes/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime from django.test import TestCase, skipIfDBFeature diff --git a/tests/dates/models.py b/tests/dates/models.py index 2161b2b356..978cf44e95 100644 --- a/tests/dates/models.py +++ b/tests/dates/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import models from django.utils import timezone from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/dates/tests.py b/tests/dates/tests.py index 503d921ee1..9cb77fe9e2 100644 --- a/tests/dates/tests.py +++ b/tests/dates/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime from unittest import skipUnless diff --git a/tests/datetimes/models.py b/tests/datetimes/models.py index 2fcb72be09..4d2ad9ac7a 100644 --- a/tests/datetimes/models.py +++ b/tests/datetimes/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/datetimes/tests.py b/tests/datetimes/tests.py index 273333e61c..50a83f0371 100644 --- a/tests/datetimes/tests.py +++ b/tests/datetimes/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime from django.test import TestCase, override_settings diff --git a/tests/db_functions/models.py b/tests/db_functions/models.py index 7494680c23..8d0fbc6deb 100644 --- a/tests/db_functions/models.py +++ b/tests/db_functions/models.py @@ -1,8 +1,6 @@ """ Tests for built in Function expressions. """ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/db_functions/test_datetime.py b/tests/db_functions/test_datetime.py index c0e98a13a9..f517b2f699 100644 --- a/tests/db_functions/test_datetime.py +++ b/tests/db_functions/test_datetime.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from datetime import datetime import pytz diff --git a/tests/db_functions/tests.py b/tests/db_functions/tests.py index 26acc687ea..c86e8eb43f 100644 --- a/tests/db_functions/tests.py +++ b/tests/db_functions/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from datetime import datetime, timedelta from unittest import skipIf, skipUnless diff --git a/tests/dbshell/test_postgresql_psycopg2.py b/tests/dbshell/test_postgresql_psycopg2.py index c75db4b188..4c4a1ae25e 100644 --- a/tests/dbshell/test_postgresql_psycopg2.py +++ b/tests/dbshell/test_postgresql_psycopg2.py @@ -1,6 +1,3 @@ -# -*- coding: utf8 -*- -from __future__ import unicode_literals - import locale import os diff --git a/tests/defer/tests.py b/tests/defer/tests.py index 65f1f2bb15..0eea9545dd 100644 --- a/tests/defer/tests.py +++ b/tests/defer/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db.models.query_utils import InvalidQuery from django.test import TestCase diff --git a/tests/defer_regress/tests.py b/tests/defer_regress/tests.py index 611b22be68..314584abb4 100644 --- a/tests/defer_regress/tests.py +++ b/tests/defer_regress/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from operator import attrgetter from django.contrib.contenttypes.models import ContentType diff --git a/tests/delete/models.py b/tests/delete/models.py index 8a6f4903d6..4064173df4 100644 --- a/tests/delete/models.py +++ b/tests/delete/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/delete/tests.py b/tests/delete/tests.py index f8203b2780..640dfabf4b 100644 --- a/tests/delete/tests.py +++ b/tests/delete/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from math import ceil from django.db import IntegrityError, connection, models diff --git a/tests/delete_regress/tests.py b/tests/delete_regress/tests.py index 2128733798..7472731e94 100644 --- a/tests/delete_regress/tests.py +++ b/tests/delete_regress/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime from django.db import connection, models, transaction diff --git a/tests/deprecation/tests.py b/tests/deprecation/tests.py index 2ad3576676..34056b663b 100644 --- a/tests/deprecation/tests.py +++ b/tests/deprecation/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import warnings from django.test import SimpleTestCase diff --git a/tests/distinct_on_fields/models.py b/tests/distinct_on_fields/models.py index 2c33f3ad80..a4164724f3 100644 --- a/tests/distinct_on_fields/models.py +++ b/tests/distinct_on_fields/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/distinct_on_fields/tests.py b/tests/distinct_on_fields/tests.py index e7445003ce..e1365dab88 100644 --- a/tests/distinct_on_fields/tests.py +++ b/tests/distinct_on_fields/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db.models import Max from django.test import TestCase, skipUnlessDBFeature from django.test.utils import str_prefix diff --git a/tests/expressions/models.py b/tests/expressions/models.py index 6dc956c8fe..e2bfb8ef67 100644 --- a/tests/expressions/models.py +++ b/tests/expressions/models.py @@ -2,8 +2,6 @@ Tests for F() query expression syntax. """ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/expressions/test_queryset_values.py b/tests/expressions/test_queryset_values.py index f9d35b4385..e264597968 100644 --- a/tests/expressions/test_queryset_values.py +++ b/tests/expressions/test_queryset_values.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db.models.aggregates import Sum from django.db.models.expressions import F from django.test import TestCase diff --git a/tests/expressions/tests.py b/tests/expressions/tests.py index 8399e3c0a9..d3eabb6dbb 100644 --- a/tests/expressions/tests.py +++ b/tests/expressions/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import unittest import uuid diff --git a/tests/expressions_case/models.py b/tests/expressions_case/models.py index 9f559a4f9d..8c2eaac399 100644 --- a/tests/expressions_case/models.py +++ b/tests/expressions_case/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/expressions_case/tests.py b/tests/expressions_case/tests.py index 4617bcacb8..414c4353a5 100644 --- a/tests/expressions_case/tests.py +++ b/tests/expressions_case/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import unittest from datetime import date, datetime, time, timedelta from decimal import Decimal diff --git a/tests/extra_regress/models.py b/tests/extra_regress/models.py index 893c32ddd6..b271d8701f 100644 --- a/tests/extra_regress/models.py +++ b/tests/extra_regress/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import copy import datetime diff --git a/tests/extra_regress/tests.py b/tests/extra_regress/tests.py index acafd8efde..53106fa249 100644 --- a/tests/extra_regress/tests.py +++ b/tests/extra_regress/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime from collections import OrderedDict diff --git a/tests/field_deconstruction/tests.py b/tests/field_deconstruction/tests.py index 1a6385dbf9..bb16f4d76e 100644 --- a/tests/field_deconstruction/tests.py +++ b/tests/field_deconstruction/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.apps import apps from django.db import models from django.test import SimpleTestCase, override_settings diff --git a/tests/field_defaults/models.py b/tests/field_defaults/models.py index 4f06232011..71129cb5c7 100644 --- a/tests/field_defaults/models.py +++ b/tests/field_defaults/models.py @@ -1,4 +1,3 @@ -# coding: utf-8 """ Callable defaults diff --git a/tests/field_subclassing/fields.py b/tests/field_subclassing/fields.py index c2e4b50c76..4eb170116f 100644 --- a/tests/field_subclassing/fields.py +++ b/tests/field_subclassing/fields.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import models diff --git a/tests/field_subclassing/tests.py b/tests/field_subclassing/tests.py index d291276c1f..a1371cab42 100644 --- a/tests/field_subclassing/tests.py +++ b/tests/field_subclassing/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import connection from django.test import SimpleTestCase diff --git a/tests/file_storage/tests.py b/tests/file_storage/tests.py index 7a8b104665..d02b6e2dbc 100644 --- a/tests/file_storage/tests.py +++ b/tests/file_storage/tests.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import errno import os import shutil diff --git a/tests/file_uploads/tests.py b/tests/file_uploads/tests.py index 5f6a50250d..769c06c904 100644 --- a/tests/file_uploads/tests.py +++ b/tests/file_uploads/tests.py @@ -1,6 +1,3 @@ -#! -*- coding: utf-8 -*- -from __future__ import unicode_literals - import base64 import errno import hashlib diff --git a/tests/file_uploads/views.py b/tests/file_uploads/views.py index 17d4a1b0f4..bba71b87c2 100644 --- a/tests/file_uploads/views.py +++ b/tests/file_uploads/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import contextlib import hashlib import json diff --git a/tests/files/tests.py b/tests/files/tests.py index 72a121fcfe..276cbed544 100644 --- a/tests/files/tests.py +++ b/tests/files/tests.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import gzip import os import struct diff --git a/tests/fixtures/tests.py b/tests/fixtures/tests.py index ff85a9b752..df5067e223 100644 --- a/tests/fixtures/tests.py +++ b/tests/fixtures/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import sys import tempfile diff --git a/tests/fixtures_model_package/tests.py b/tests/fixtures_model_package/tests.py index 6b508a1991..d26a81e3be 100644 --- a/tests/fixtures_model_package/tests.py +++ b/tests/fixtures_model_package/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core import management from django.core.management import CommandError from django.test import TestCase diff --git a/tests/fixtures_regress/models.py b/tests/fixtures_regress/models.py index 084b602b7c..63e883f7d5 100644 --- a/tests/fixtures_regress/models.py +++ b/tests/fixtures_regress/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 import six diff --git a/tests/fixtures_regress/tests.py b/tests/fixtures_regress/tests.py index 657ea13b36..3667fcbd4c 100644 --- a/tests/fixtures_regress/tests.py +++ b/tests/fixtures_regress/tests.py @@ -1,7 +1,4 @@ -# -*- coding: utf-8 -*- # Unittests for fixtures. -from __future__ import unicode_literals - import json import os import re diff --git a/tests/flatpages_tests/test_forms.py b/tests/flatpages_tests/test_forms.py index 100669be59..228790a448 100644 --- a/tests/flatpages_tests/test_forms.py +++ b/tests/flatpages_tests/test_forms.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf import settings from django.contrib.flatpages.forms import FlatpageForm from django.contrib.flatpages.models import FlatPage diff --git a/tests/flatpages_tests/test_models.py b/tests/flatpages_tests/test_models.py index ccb73c799e..19d61cfff7 100644 --- a/tests/flatpages_tests/test_models.py +++ b/tests/flatpages_tests/test_models.py @@ -1,7 +1,3 @@ -# -*- coding: utf-8 -*- - -from __future__ import unicode_literals - from django.contrib.flatpages.models import FlatPage from django.test import SimpleTestCase from django.test.utils import override_script_prefix diff --git a/tests/flatpages_tests/test_sitemaps.py b/tests/flatpages_tests/test_sitemaps.py index 5be4fe518a..10076798c0 100644 --- a/tests/flatpages_tests/test_sitemaps.py +++ b/tests/flatpages_tests/test_sitemaps.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.apps import apps from django.contrib.sites.models import Site from django.test import TestCase diff --git a/tests/force_insert_update/tests.py b/tests/force_insert_update/tests.py index ae8b771ed1..2232283cb8 100644 --- a/tests/force_insert_update/tests.py +++ b/tests/force_insert_update/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import DatabaseError, IntegrityError, transaction from django.test import TestCase diff --git a/tests/forms_tests/field_tests/test_booleanfield.py b/tests/forms_tests/field_tests/test_booleanfield.py index e267777b94..d2ed9d7955 100644 --- a/tests/forms_tests/field_tests/test_booleanfield.py +++ b/tests/forms_tests/field_tests/test_booleanfield.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import pickle from django.forms import BooleanField, ValidationError diff --git a/tests/forms_tests/field_tests/test_charfield.py b/tests/forms_tests/field_tests/test_charfield.py index d8fa41b073..a59291e33a 100644 --- a/tests/forms_tests/field_tests/test_charfield.py +++ b/tests/forms_tests/field_tests/test_charfield.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.forms import ( CharField, HiddenInput, PasswordInput, Textarea, TextInput, ValidationError, diff --git a/tests/forms_tests/field_tests/test_choicefield.py b/tests/forms_tests/field_tests/test_choicefield.py index 1d8fe5a3cf..f500c18680 100644 --- a/tests/forms_tests/field_tests/test_choicefield.py +++ b/tests/forms_tests/field_tests/test_choicefield.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.forms import ChoiceField, Form, ValidationError from django.test import SimpleTestCase, ignore_warnings diff --git a/tests/forms_tests/field_tests/test_combofield.py b/tests/forms_tests/field_tests/test_combofield.py index 6ca91233bc..b40e7ba885 100644 --- a/tests/forms_tests/field_tests/test_combofield.py +++ b/tests/forms_tests/field_tests/test_combofield.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.forms import CharField, ComboField, EmailField, ValidationError from django.test import SimpleTestCase diff --git a/tests/forms_tests/field_tests/test_datefield.py b/tests/forms_tests/field_tests/test_datefield.py index b23b5a42ce..77573e8dcf 100644 --- a/tests/forms_tests/field_tests/test_datefield.py +++ b/tests/forms_tests/field_tests/test_datefield.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from datetime import date, datetime from django.forms import ( diff --git a/tests/forms_tests/field_tests/test_datetimefield.py b/tests/forms_tests/field_tests/test_datetimefield.py index f83b9b7f76..a1cfd22053 100644 --- a/tests/forms_tests/field_tests/test_datetimefield.py +++ b/tests/forms_tests/field_tests/test_datetimefield.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime from django.forms import DateTimeField, ValidationError diff --git a/tests/forms_tests/field_tests/test_decimalfield.py b/tests/forms_tests/field_tests/test_decimalfield.py index 02600bcb5b..c8fd95fd68 100644 --- a/tests/forms_tests/field_tests/test_decimalfield.py +++ b/tests/forms_tests/field_tests/test_decimalfield.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import decimal from django.forms import DecimalField, NumberInput, ValidationError, Widget diff --git a/tests/forms_tests/field_tests/test_durationfield.py b/tests/forms_tests/field_tests/test_durationfield.py index 28fd245a79..ce578ff82f 100644 --- a/tests/forms_tests/field_tests/test_durationfield.py +++ b/tests/forms_tests/field_tests/test_durationfield.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime from django.forms import DurationField diff --git a/tests/forms_tests/field_tests/test_emailfield.py b/tests/forms_tests/field_tests/test_emailfield.py index 906a6cf5ff..15481689b0 100644 --- a/tests/forms_tests/field_tests/test_emailfield.py +++ b/tests/forms_tests/field_tests/test_emailfield.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.forms import EmailField, ValidationError from django.test import SimpleTestCase diff --git a/tests/forms_tests/field_tests/test_filefield.py b/tests/forms_tests/field_tests/test_filefield.py index 2c08075f3f..1862475a5a 100644 --- a/tests/forms_tests/field_tests/test_filefield.py +++ b/tests/forms_tests/field_tests/test_filefield.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import pickle from django.core.files.uploadedfile import SimpleUploadedFile diff --git a/tests/forms_tests/field_tests/test_filepathfield.py b/tests/forms_tests/field_tests/test_filepathfield.py index 60336d0dcf..07ebe67f06 100644 --- a/tests/forms_tests/field_tests/test_filepathfield.py +++ b/tests/forms_tests/field_tests/test_filepathfield.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os.path from django.forms import FilePathField, ValidationError, forms diff --git a/tests/forms_tests/field_tests/test_floatfield.py b/tests/forms_tests/field_tests/test_floatfield.py index d4ef4f496b..83209d7c66 100644 --- a/tests/forms_tests/field_tests/test_floatfield.py +++ b/tests/forms_tests/field_tests/test_floatfield.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.forms import FloatField, NumberInput, ValidationError from django.test import SimpleTestCase from django.utils import formats, translation diff --git a/tests/forms_tests/field_tests/test_genericipaddressfield.py b/tests/forms_tests/field_tests/test_genericipaddressfield.py index 011630fb0d..97a83e38ae 100644 --- a/tests/forms_tests/field_tests/test_genericipaddressfield.py +++ b/tests/forms_tests/field_tests/test_genericipaddressfield.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.forms import GenericIPAddressField, ValidationError from django.test import SimpleTestCase diff --git a/tests/forms_tests/field_tests/test_imagefield.py b/tests/forms_tests/field_tests/test_imagefield.py index ee0e1e3b73..326735bf60 100644 --- a/tests/forms_tests/field_tests/test_imagefield.py +++ b/tests/forms_tests/field_tests/test_imagefield.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import unittest diff --git a/tests/forms_tests/field_tests/test_integerfield.py b/tests/forms_tests/field_tests/test_integerfield.py index cd648279a6..f89885027b 100644 --- a/tests/forms_tests/field_tests/test_integerfield.py +++ b/tests/forms_tests/field_tests/test_integerfield.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.forms import IntegerField, Textarea, ValidationError from django.test import SimpleTestCase diff --git a/tests/forms_tests/field_tests/test_multiplechoicefield.py b/tests/forms_tests/field_tests/test_multiplechoicefield.py index 85b7049854..dee916bd8e 100644 --- a/tests/forms_tests/field_tests/test_multiplechoicefield.py +++ b/tests/forms_tests/field_tests/test_multiplechoicefield.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.forms import MultipleChoiceField, ValidationError from django.test import SimpleTestCase diff --git a/tests/forms_tests/field_tests/test_nullbooleanfield.py b/tests/forms_tests/field_tests/test_nullbooleanfield.py index ff4a16060e..ff57394f07 100644 --- a/tests/forms_tests/field_tests/test_nullbooleanfield.py +++ b/tests/forms_tests/field_tests/test_nullbooleanfield.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.forms import Form, HiddenInput, NullBooleanField, RadioSelect from django.test import SimpleTestCase diff --git a/tests/forms_tests/field_tests/test_regexfield.py b/tests/forms_tests/field_tests/test_regexfield.py index 02a627b8d2..bd8d6dda09 100644 --- a/tests/forms_tests/field_tests/test_regexfield.py +++ b/tests/forms_tests/field_tests/test_regexfield.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import re from django.forms import RegexField, ValidationError diff --git a/tests/forms_tests/field_tests/test_slugfield.py b/tests/forms_tests/field_tests/test_slugfield.py index 1a522c9d4f..d883f7f5c9 100644 --- a/tests/forms_tests/field_tests/test_slugfield.py +++ b/tests/forms_tests/field_tests/test_slugfield.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.forms import SlugField from django.test import SimpleTestCase diff --git a/tests/forms_tests/field_tests/test_splitdatetimefield.py b/tests/forms_tests/field_tests/test_splitdatetimefield.py index db8df41441..be70edd3d4 100644 --- a/tests/forms_tests/field_tests/test_splitdatetimefield.py +++ b/tests/forms_tests/field_tests/test_splitdatetimefield.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime from django.forms import SplitDateTimeField, ValidationError diff --git a/tests/forms_tests/field_tests/test_timefield.py b/tests/forms_tests/field_tests/test_timefield.py index 3c73cc37b6..bd8a67992f 100644 --- a/tests/forms_tests/field_tests/test_timefield.py +++ b/tests/forms_tests/field_tests/test_timefield.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime from django.forms import TimeField, ValidationError diff --git a/tests/forms_tests/field_tests/test_typedchoicefield.py b/tests/forms_tests/field_tests/test_typedchoicefield.py index 26a7a25d05..c08a8bb611 100644 --- a/tests/forms_tests/field_tests/test_typedchoicefield.py +++ b/tests/forms_tests/field_tests/test_typedchoicefield.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import decimal from django.forms import TypedChoiceField, ValidationError diff --git a/tests/forms_tests/field_tests/test_typedmultiplechoicefield.py b/tests/forms_tests/field_tests/test_typedmultiplechoicefield.py index 94823e0594..b33d26bdaa 100644 --- a/tests/forms_tests/field_tests/test_typedmultiplechoicefield.py +++ b/tests/forms_tests/field_tests/test_typedmultiplechoicefield.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import decimal from django.forms import TypedMultipleChoiceField, ValidationError diff --git a/tests/forms_tests/field_tests/test_urlfield.py b/tests/forms_tests/field_tests/test_urlfield.py index d0b6d00482..715e8e99e0 100644 --- a/tests/forms_tests/field_tests/test_urlfield.py +++ b/tests/forms_tests/field_tests/test_urlfield.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.forms import URLField, ValidationError from django.test import SimpleTestCase diff --git a/tests/forms_tests/field_tests/test_uuidfield.py b/tests/forms_tests/field_tests/test_uuidfield.py index fe432e0725..08498ab9c9 100644 --- a/tests/forms_tests/field_tests/test_uuidfield.py +++ b/tests/forms_tests/field_tests/test_uuidfield.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import uuid from django.forms import UUIDField, ValidationError diff --git a/tests/forms_tests/models.py b/tests/forms_tests/models.py index cf770abb02..be1b66bce6 100644 --- a/tests/forms_tests/models.py +++ b/tests/forms_tests/models.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import datetime import itertools import tempfile diff --git a/tests/forms_tests/tests/test_error_messages.py b/tests/forms_tests/tests/test_error_messages.py index 4ae550efc2..eb7debf936 100644 --- a/tests/forms_tests/tests/test_error_messages.py +++ b/tests/forms_tests/tests/test_error_messages.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.core.files.uploadedfile import SimpleUploadedFile from django.forms import ( BooleanField, CharField, ChoiceField, DateField, DateTimeField, diff --git a/tests/forms_tests/tests/test_forms.py b/tests/forms_tests/tests/test_forms.py index 2b93575bf2..b8ced2425c 100644 --- a/tests/forms_tests/tests/test_forms.py +++ b/tests/forms_tests/tests/test_forms.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import copy import datetime import json diff --git a/tests/forms_tests/tests/test_formsets.py b/tests/forms_tests/tests/test_formsets.py index 29f0befc18..125ed273e9 100644 --- a/tests/forms_tests/tests/test_formsets.py +++ b/tests/forms_tests/tests/test_formsets.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import datetime from collections import Counter diff --git a/tests/forms_tests/tests/test_i18n.py b/tests/forms_tests/tests/test_i18n.py index 56225e0dd5..a8a2cf3846 100644 --- a/tests/forms_tests/tests/test_i18n.py +++ b/tests/forms_tests/tests/test_i18n.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.forms import ( CharField, ChoiceField, Form, IntegerField, RadioSelect, Select, TextInput, ) diff --git a/tests/forms_tests/tests/test_media.py b/tests/forms_tests/tests/test_media.py index d0d226d06e..cd5cc1f804 100644 --- a/tests/forms_tests/tests/test_media.py +++ b/tests/forms_tests/tests/test_media.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from django.forms import CharField, Form, Media, MultiWidget, TextInput from django.template import Context, Template from django.test import SimpleTestCase, override_settings diff --git a/tests/forms_tests/tests/test_utils.py b/tests/forms_tests/tests/test_utils.py index f95c956322..d0dfaad370 100644 --- a/tests/forms_tests/tests/test_utils.py +++ b/tests/forms_tests/tests/test_utils.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import copy from django.core.exceptions import ValidationError diff --git a/tests/forms_tests/tests/test_validators.py b/tests/forms_tests/tests/test_validators.py index 19d0d91fd5..c5e1f1e980 100644 --- a/tests/forms_tests/tests/test_validators.py +++ b/tests/forms_tests/tests/test_validators.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import re from unittest import TestCase diff --git a/tests/forms_tests/tests/test_widgets.py b/tests/forms_tests/tests/test_widgets.py index f67954fd3a..3e137532b9 100644 --- a/tests/forms_tests/tests/test_widgets.py +++ b/tests/forms_tests/tests/test_widgets.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.admin.tests import AdminSeleniumTestCase from django.test import override_settings from django.urls import reverse diff --git a/tests/forms_tests/tests/tests.py b/tests/forms_tests/tests/tests.py index f0007fbe8f..025b749762 100644 --- a/tests/forms_tests/tests/tests.py +++ b/tests/forms_tests/tests/tests.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import datetime from django.core.files.uploadedfile import SimpleUploadedFile diff --git a/tests/forms_tests/widget_tests/test_select.py b/tests/forms_tests/widget_tests/test_select.py index d2660ea787..23d6126810 100644 --- a/tests/forms_tests/widget_tests/test_select.py +++ b/tests/forms_tests/widget_tests/test_select.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import copy from django.forms import Select diff --git a/tests/forms_tests/widget_tests/test_textinput.py b/tests/forms_tests/widget_tests/test_textinput.py index 65b5da4e03..906687d971 100644 --- a/tests/forms_tests/widget_tests/test_textinput.py +++ b/tests/forms_tests/widget_tests/test_textinput.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.forms import TextInput from django.utils.safestring import mark_safe diff --git a/tests/forms_tests/widget_tests/test_widget.py b/tests/forms_tests/widget_tests/test_widget.py index 595748a7b2..368c315be7 100644 --- a/tests/forms_tests/widget_tests/test_widget.py +++ b/tests/forms_tests/widget_tests/test_widget.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.forms import Widget from django.forms.widgets import Input diff --git a/tests/generic_inline_admin/tests.py b/tests/generic_inline_admin/tests.py index a25294beda..203d9d7f3e 100644 --- a/tests/generic_inline_admin/tests.py +++ b/tests/generic_inline_admin/tests.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.contrib import admin from django.contrib.admin.sites import AdminSite from django.contrib.auth.models import User diff --git a/tests/generic_relations/models.py b/tests/generic_relations/models.py index 7522f5b4cd..f1748b7433 100644 --- a/tests/generic_relations/models.py +++ b/tests/generic_relations/models.py @@ -9,8 +9,6 @@ The canonical example is tags (although this example implementation is *far* from complete). """ -from __future__ import unicode_literals - from django.contrib.contenttypes.fields import ( GenericForeignKey, GenericRelation, ) diff --git a/tests/generic_relations/tests.py b/tests/generic_relations/tests.py index 540c3456f2..5bfea72cf1 100644 --- a/tests/generic_relations/tests.py +++ b/tests/generic_relations/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import forms from django.contrib.contenttypes.forms import generic_inlineformset_factory from django.contrib.contenttypes.models import ContentType diff --git a/tests/generic_views/forms.py b/tests/generic_views/forms.py index 1ee26afc8f..fd8106d1a8 100644 --- a/tests/generic_views/forms.py +++ b/tests/generic_views/forms.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import forms from .models import Author diff --git a/tests/generic_views/test_base.py b/tests/generic_views/test_base.py index a667a4e495..be89592dbc 100644 --- a/tests/generic_views/test_base.py +++ b/tests/generic_views/test_base.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import time import unittest diff --git a/tests/generic_views/test_dates.py b/tests/generic_views/test_dates.py index 9b7c20ec73..d18c818989 100644 --- a/tests/generic_views/test_dates.py +++ b/tests/generic_views/test_dates.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import datetime from django.core.exceptions import ImproperlyConfigured diff --git a/tests/generic_views/test_detail.py b/tests/generic_views/test_detail.py index 4c91f6eeb0..da20db066e 100644 --- a/tests/generic_views/test_detail.py +++ b/tests/generic_views/test_detail.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import datetime from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist diff --git a/tests/generic_views/test_edit.py b/tests/generic_views/test_edit.py index c1b9eba9d8..3a68fc4098 100644 --- a/tests/generic_views/test_edit.py +++ b/tests/generic_views/test_edit.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import forms from django.core.exceptions import ImproperlyConfigured from django.test import SimpleTestCase, TestCase, override_settings diff --git a/tests/generic_views/test_list.py b/tests/generic_views/test_list.py index 5a22abd33b..d5851d4ff8 100644 --- a/tests/generic_views/test_list.py +++ b/tests/generic_views/test_list.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import datetime from django.core.exceptions import ImproperlyConfigured diff --git a/tests/generic_views/urls.py b/tests/generic_views/urls.py index 9f2d8429fc..3475bfc357 100644 --- a/tests/generic_views/urls.py +++ b/tests/generic_views/urls.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.conf.urls import url from django.contrib.auth import views as auth_views from django.contrib.auth.decorators import login_required diff --git a/tests/generic_views/views.py b/tests/generic_views/views.py index e46bc09143..b466f3a324 100644 --- a/tests/generic_views/views.py +++ b/tests/generic_views/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.auth.decorators import login_required from django.core.paginator import Paginator from django.urls import reverse, reverse_lazy diff --git a/tests/get_earliest_or_latest/tests.py b/tests/get_earliest_or_latest/tests.py index 56d48d0710..2322e0a91c 100644 --- a/tests/get_earliest_or_latest/tests.py +++ b/tests/get_earliest_or_latest/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from datetime import datetime from django.test import TestCase diff --git a/tests/get_object_or_404/tests.py b/tests/get_object_or_404/tests.py index bf10ea3109..b5a233568d 100644 --- a/tests/get_object_or_404/tests.py +++ b/tests/get_object_or_404/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.http import Http404 from django.shortcuts import get_list_or_404, get_object_or_404 from django.test import TestCase diff --git a/tests/get_or_create/models.py b/tests/get_or_create/models.py index 0394434408..5d6e69de3a 100644 --- a/tests/get_or_create/models.py +++ b/tests/get_or_create/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/get_or_create/tests.py b/tests/get_or_create/tests.py index d727bdee5d..27a0cb7737 100644 --- a/tests/get_or_create/tests.py +++ b/tests/get_or_create/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import time import traceback from datetime import date, datetime, timedelta diff --git a/tests/gis_tests/distapp/tests.py b/tests/gis_tests/distapp/tests.py index 01f0a620dc..9d67b7b013 100644 --- a/tests/gis_tests/distapp/tests.py +++ b/tests/gis_tests/distapp/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.gis.db.models.functions import ( Area, Distance, Length, Perimeter, Transform, ) diff --git a/tests/gis_tests/gdal_tests/test_srs.py b/tests/gis_tests/gdal_tests/test_srs.py index d03d8dcfd3..9bc6c0a2c5 100644 --- a/tests/gis_tests/gdal_tests/test_srs.py +++ b/tests/gis_tests/gdal_tests/test_srs.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import unittest from unittest import skipUnless diff --git a/tests/gis_tests/geo3d/tests.py b/tests/gis_tests/geo3d/tests.py index 946928b919..e32611934a 100644 --- a/tests/gis_tests/geo3d/tests.py +++ b/tests/gis_tests/geo3d/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import re diff --git a/tests/gis_tests/geoadmin/tests.py b/tests/gis_tests/geoadmin/tests.py index 88c3934020..23fa8071b3 100644 --- a/tests/gis_tests/geoadmin/tests.py +++ b/tests/gis_tests/geoadmin/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.gis import admin from django.contrib.gis.geos import Point from django.test import TestCase, override_settings, skipUnlessDBFeature diff --git a/tests/gis_tests/geoapp/feeds.py b/tests/gis_tests/geoapp/feeds.py index 4a0ec7647d..185f3b56e3 100644 --- a/tests/gis_tests/geoapp/feeds.py +++ b/tests/gis_tests/geoapp/feeds.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.gis import feeds from .models import City diff --git a/tests/gis_tests/geoapp/test_feeds.py b/tests/gis_tests/geoapp/test_feeds.py index 0974554737..c8fd32802f 100644 --- a/tests/gis_tests/geoapp/test_feeds.py +++ b/tests/gis_tests/geoapp/test_feeds.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from xml.dom import minidom from django.conf import settings diff --git a/tests/gis_tests/geoapp/test_functions.py b/tests/gis_tests/geoapp/test_functions.py index e551de6890..2767b7974b 100644 --- a/tests/gis_tests/geoapp/test_functions.py +++ b/tests/gis_tests/geoapp/test_functions.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import re from decimal import Decimal diff --git a/tests/gis_tests/geoapp/test_regress.py b/tests/gis_tests/geoapp/test_regress.py index a075d447ef..2d62349dbb 100644 --- a/tests/gis_tests/geoapp/test_regress.py +++ b/tests/gis_tests/geoapp/test_regress.py @@ -1,6 +1,3 @@ -# -*- encoding: utf-8 -*- -from __future__ import unicode_literals - from datetime import datetime from django.contrib.gis.db.models import Extent diff --git a/tests/gis_tests/geoapp/test_serializers.py b/tests/gis_tests/geoapp/test_serializers.py index f82edfa53e..7f756e1544 100644 --- a/tests/gis_tests/geoapp/test_serializers.py +++ b/tests/gis_tests/geoapp/test_serializers.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import json from django.contrib.gis.geos import LinearRing, Point, Polygon diff --git a/tests/gis_tests/geoapp/test_sitemaps.py b/tests/gis_tests/geoapp/test_sitemaps.py index e17a48a624..61e06df728 100644 --- a/tests/gis_tests/geoapp/test_sitemaps.py +++ b/tests/gis_tests/geoapp/test_sitemaps.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import zipfile from io import BytesIO from xml.dom import minidom diff --git a/tests/gis_tests/geoapp/tests.py b/tests/gis_tests/geoapp/tests.py index cbbf0357bc..4324364c0d 100644 --- a/tests/gis_tests/geoapp/tests.py +++ b/tests/gis_tests/geoapp/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import tempfile from django.contrib.gis import gdal diff --git a/tests/gis_tests/geoapp/urls.py b/tests/gis_tests/geoapp/urls.py index 40a48053c7..0e148bf4f3 100644 --- a/tests/gis_tests/geoapp/urls.py +++ b/tests/gis_tests/geoapp/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf.urls import url from django.contrib.gis import views as gis_views from django.contrib.gis.sitemaps import views as gis_sitemap_views diff --git a/tests/gis_tests/geogapp/tests.py b/tests/gis_tests/geogapp/tests.py index d9f02184ea..7112f0238e 100644 --- a/tests/gis_tests/geogapp/tests.py +++ b/tests/gis_tests/geogapp/tests.py @@ -1,8 +1,6 @@ """ Tests for geography support in PostGIS """ -from __future__ import unicode_literals - import os from unittest import skipIf, skipUnless diff --git a/tests/gis_tests/geos_tests/test_geos.py b/tests/gis_tests/geos_tests/test_geos.py index 46583c9605..ff28eebf0f 100644 --- a/tests/gis_tests/geos_tests/test_geos.py +++ b/tests/gis_tests/geos_tests/test_geos.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import ctypes import json import random diff --git a/tests/gis_tests/geos_tests/test_io.py b/tests/gis_tests/geos_tests/test_io.py index 47995bf88c..81e0ff357f 100644 --- a/tests/gis_tests/geos_tests/test_io.py +++ b/tests/gis_tests/geos_tests/test_io.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import binascii from unittest import skipUnless diff --git a/tests/gis_tests/gis_migrations/test_commands.py b/tests/gis_tests/gis_migrations/test_commands.py index 65bd035b8c..c9bf3773fe 100644 --- a/tests/gis_tests/gis_migrations/test_commands.py +++ b/tests/gis_tests/gis_migrations/test_commands.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.management import call_command from django.db import connection from django.test import TransactionTestCase, skipUnlessDBFeature diff --git a/tests/gis_tests/gis_migrations/test_operations.py b/tests/gis_tests/gis_migrations/test_operations.py index 26ff16feed..0c8853a9f3 100644 --- a/tests/gis_tests/gis_migrations/test_operations.py +++ b/tests/gis_tests/gis_migrations/test_operations.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from unittest import skipIf from django.contrib.gis.db.models import fields diff --git a/tests/gis_tests/inspectapp/tests.py b/tests/gis_tests/inspectapp/tests.py index 75865997dc..b451603e7c 100644 --- a/tests/gis_tests/inspectapp/tests.py +++ b/tests/gis_tests/inspectapp/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import re diff --git a/tests/gis_tests/layermap/tests.py b/tests/gis_tests/layermap/tests.py index a8a352eda5..0f59132b0d 100644 --- a/tests/gis_tests/layermap/tests.py +++ b/tests/gis_tests/layermap/tests.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import os import unittest from copy import copy diff --git a/tests/gis_tests/relatedapp/tests.py b/tests/gis_tests/relatedapp/tests.py index 861b6ee2d9..b8da0f24f1 100644 --- a/tests/gis_tests/relatedapp/tests.py +++ b/tests/gis_tests/relatedapp/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.gis.db.models import Collect, Count, Extent, F, Union from django.contrib.gis.geometry.backend import Geometry from django.contrib.gis.geos import GEOSGeometry, MultiPoint, Point diff --git a/tests/gis_tests/test_geoip2.py b/tests/gis_tests/test_geoip2.py index 7db1648cca..54f20412a4 100644 --- a/tests/gis_tests/test_geoip2.py +++ b/tests/gis_tests/test_geoip2.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import os import unittest from unittest import skipUnless diff --git a/tests/handlers/tests.py b/tests/handlers/tests.py index a420917421..bae2043918 100644 --- a/tests/handlers/tests.py +++ b/tests/handlers/tests.py @@ -1,7 +1,3 @@ -# -*- coding: utf-8 -*- - -from __future__ import unicode_literals - import unittest from django.core.exceptions import ImproperlyConfigured diff --git a/tests/handlers/urls.py b/tests/handlers/urls.py index 9d23fd3fa7..1a22859093 100644 --- a/tests/handlers/urls.py +++ b/tests/handlers/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf.urls import url from . import views diff --git a/tests/handlers/views.py b/tests/handlers/views.py index 21c1387f08..22b94de3b9 100644 --- a/tests/handlers/views.py +++ b/tests/handlers/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.exceptions import SuspiciousOperation from django.db import connection, transaction from django.http import HttpResponse, StreamingHttpResponse diff --git a/tests/httpwrappers/tests.py b/tests/httpwrappers/tests.py index 3ab21751f5..d9885ea40c 100644 --- a/tests/httpwrappers/tests.py +++ b/tests/httpwrappers/tests.py @@ -1,6 +1,3 @@ -# -*- encoding: utf-8 -*- -from __future__ import unicode_literals - import copy import json import os diff --git a/tests/humanize_tests/tests.py b/tests/humanize_tests/tests.py index a3cc512239..90a5155cfb 100644 --- a/tests/humanize_tests/tests.py +++ b/tests/humanize_tests/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime from decimal import Decimal diff --git a/tests/i18n/contenttypes/tests.py b/tests/i18n/contenttypes/tests.py index 890fa1156b..2a14e25972 100644 --- a/tests/i18n/contenttypes/tests.py +++ b/tests/i18n/contenttypes/tests.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import os from django.contrib.contenttypes.models import ContentType diff --git a/tests/i18n/patterns/tests.py b/tests/i18n/patterns/tests.py index 6706e32e84..a889125e82 100644 --- a/tests/i18n/patterns/tests.py +++ b/tests/i18n/patterns/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os from django.conf import settings diff --git a/tests/i18n/test_compilation.py b/tests/i18n/test_compilation.py index b33338800a..d17078e290 100644 --- a/tests/i18n/test_compilation.py +++ b/tests/i18n/test_compilation.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import gettext as gettext_module import os import stat diff --git a/tests/i18n/test_extraction.py b/tests/i18n/test_extraction.py index 9311a1e7f0..33e136e1dd 100644 --- a/tests/i18n/test_extraction.py +++ b/tests/i18n/test_extraction.py @@ -1,6 +1,3 @@ -# -*- encoding: utf-8 -*- -from __future__ import unicode_literals - import io import os import re diff --git a/tests/i18n/test_percents.py b/tests/i18n/test_percents.py index 6e39b59a7f..48d62ada05 100644 --- a/tests/i18n/test_percents.py +++ b/tests/i18n/test_percents.py @@ -1,6 +1,3 @@ -# -*- encoding: utf-8 -*- -from __future__ import unicode_literals - import os from django.template import Context, Template diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py index 6e2269da4c..2b9793109b 100644 --- a/tests/i18n/tests.py +++ b/tests/i18n/tests.py @@ -1,6 +1,3 @@ -# -*- encoding: utf-8 -*- -from __future__ import unicode_literals - import datetime import decimal import gettext as gettext_module diff --git a/tests/i18n/urls.py b/tests/i18n/urls.py index af2abb9fb8..911a1cf8e7 100644 --- a/tests/i18n/urls.py +++ b/tests/i18n/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf.urls import url from django.conf.urls.i18n import i18n_patterns from django.http import HttpResponse, StreamingHttpResponse diff --git a/tests/inline_formsets/models.py b/tests/inline_formsets/models.py index 70f9008d8b..42cf810f53 100644 --- a/tests/inline_formsets/models.py +++ b/tests/inline_formsets/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/inline_formsets/tests.py b/tests/inline_formsets/tests.py index 6e96f51e6f..0fb2fd2f02 100644 --- a/tests/inline_formsets/tests.py +++ b/tests/inline_formsets/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.forms.models import ModelForm, inlineformset_factory from django.test import TestCase, skipUnlessDBFeature from django.utils import six diff --git a/tests/inspectdb/models.py b/tests/inspectdb/models.py index 868f3ba4fe..668fc51aed 100644 --- a/tests/inspectdb/models.py +++ b/tests/inspectdb/models.py @@ -1,6 +1,3 @@ -# -*- encoding: utf-8 -*- -from __future__ import unicode_literals - from django.db import models diff --git a/tests/inspectdb/tests.py b/tests/inspectdb/tests.py index daa0800d7c..1293ff68ac 100644 --- a/tests/inspectdb/tests.py +++ b/tests/inspectdb/tests.py @@ -1,6 +1,3 @@ -# -*- encoding: utf-8 -*- -from __future__ import unicode_literals - import re from unittest import skipUnless diff --git a/tests/introspection/models.py b/tests/introspection/models.py index b8c7a83b9f..023e622beb 100644 --- a/tests/introspection/models.py +++ b/tests/introspection/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/introspection/tests.py b/tests/introspection/tests.py index 816c4a9b37..a85748d958 100644 --- a/tests/introspection/tests.py +++ b/tests/introspection/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from unittest import skipUnless from django.db import connection diff --git a/tests/invalid_models_tests/test_backend_specific.py b/tests/invalid_models_tests/test_backend_specific.py index 05ba04a4ea..6321b6d7be 100644 --- a/tests/invalid_models_tests/test_backend_specific.py +++ b/tests/invalid_models_tests/test_backend_specific.py @@ -1,6 +1,3 @@ -# -*- encoding: utf-8 -*- -from __future__ import unicode_literals - from django.core.checks import Error from django.db import connections, models from django.test import SimpleTestCase, mock diff --git a/tests/invalid_models_tests/test_models.py b/tests/invalid_models_tests/test_models.py index 662035af75..7bb9497690 100644 --- a/tests/invalid_models_tests/test_models.py +++ b/tests/invalid_models_tests/test_models.py @@ -1,6 +1,3 @@ -# -*- encoding: utf-8 -*- -from __future__ import unicode_literals - import unittest from django.conf import settings diff --git a/tests/invalid_models_tests/test_ordinary_fields.py b/tests/invalid_models_tests/test_ordinary_fields.py index 3f601e1fcf..61f93e8578 100644 --- a/tests/invalid_models_tests/test_ordinary_fields.py +++ b/tests/invalid_models_tests/test_ordinary_fields.py @@ -1,6 +1,3 @@ -# -*- encoding: utf-8 -*- -from __future__ import unicode_literals - import unittest from django.core.checks import Error, Warning as DjangoWarning diff --git a/tests/invalid_models_tests/test_relative_fields.py b/tests/invalid_models_tests/test_relative_fields.py index 2165e6dfb5..5fd76229e9 100644 --- a/tests/invalid_models_tests/test_relative_fields.py +++ b/tests/invalid_models_tests/test_relative_fields.py @@ -1,6 +1,3 @@ -# -*- encoding: utf-8 -*- -from __future__ import unicode_literals - from django.core.checks import Error, Warning as DjangoWarning from django.db import models from django.db.models.fields.related import ForeignObject diff --git a/tests/known_related_objects/tests.py b/tests/known_related_objects/tests.py index bb664a8102..c0afe4f0b9 100644 --- a/tests/known_related_objects/tests.py +++ b/tests/known_related_objects/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.test import TestCase from .models import Organiser, Pool, PoolStyle, Tournament diff --git a/tests/logging_tests/tests.py b/tests/logging_tests/tests.py index 0557ea182b..134cc71808 100644 --- a/tests/logging_tests/tests.py +++ b/tests/logging_tests/tests.py @@ -1,6 +1,3 @@ -# -*- coding:utf-8 -*- -from __future__ import unicode_literals - import logging from contextlib import contextmanager diff --git a/tests/logging_tests/urls.py b/tests/logging_tests/urls.py index ca6dd9b430..fa2c0fcd02 100644 --- a/tests/logging_tests/urls.py +++ b/tests/logging_tests/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf.urls import url from . import views diff --git a/tests/logging_tests/urls_i18n.py b/tests/logging_tests/urls_i18n.py index 80ce990413..220f5e4732 100644 --- a/tests/logging_tests/urls_i18n.py +++ b/tests/logging_tests/urls_i18n.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf.urls import url from django.conf.urls.i18n import i18n_patterns from django.http import HttpResponse diff --git a/tests/logging_tests/views.py b/tests/logging_tests/views.py index a362509700..cb7112e435 100644 --- a/tests/logging_tests/views.py +++ b/tests/logging_tests/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.exceptions import DisallowedHost, SuspiciousOperation from django.http import HttpResponse diff --git a/tests/lookup/models.py b/tests/lookup/models.py index cfc0cecb99..3490422f69 100644 --- a/tests/lookup/models.py +++ b/tests/lookup/models.py @@ -4,8 +4,6 @@ The lookup API This demonstrates features of the database API. """ -from __future__ import unicode_literals - from django.db import models from django.utils import six from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/lookup/test_timefield.py b/tests/lookup/test_timefield.py index 0a96992a32..6ef1d794e2 100644 --- a/tests/lookup/test_timefield.py +++ b/tests/lookup/test_timefield.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.test import TestCase from .models import Alarm diff --git a/tests/lookup/tests.py b/tests/lookup/tests.py index 78e68dfc4a..1da7084e48 100644 --- a/tests/lookup/tests.py +++ b/tests/lookup/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import collections from datetime import datetime from operator import attrgetter diff --git a/tests/m2m_and_m2o/models.py b/tests/m2m_and_m2o/models.py index 60f5c43733..621c56ca1a 100644 --- a/tests/m2m_and_m2o/models.py +++ b/tests/m2m_and_m2o/models.py @@ -3,8 +3,6 @@ Many-to-many and many-to-one relationships to the same table Make sure to set ``related_name`` if you use relationships to the same table. """ -from __future__ import unicode_literals - from django.db import models from django.utils import six from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/m2m_intermediary/models.py b/tests/m2m_intermediary/models.py index 3e73164e6f..dbd822df51 100644 --- a/tests/m2m_intermediary/models.py +++ b/tests/m2m_intermediary/models.py @@ -9,8 +9,6 @@ each ``Article``-``Reporter`` combination (a ``Writer``) has a ``position`` field, which specifies the ``Reporter``'s position for the given article (e.g. "Staff writer"). """ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/m2m_intermediary/tests.py b/tests/m2m_intermediary/tests.py index ce4e186004..d429bf6516 100644 --- a/tests/m2m_intermediary/tests.py +++ b/tests/m2m_intermediary/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from datetime import datetime from django.test import TestCase diff --git a/tests/m2m_multiple/tests.py b/tests/m2m_multiple/tests.py index 9d605423ad..1fa2767764 100644 --- a/tests/m2m_multiple/tests.py +++ b/tests/m2m_multiple/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from datetime import datetime from django.test import TestCase diff --git a/tests/m2m_recursive/tests.py b/tests/m2m_recursive/tests.py index c6573800a8..b2667a8d52 100644 --- a/tests/m2m_recursive/tests.py +++ b/tests/m2m_recursive/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from operator import attrgetter from django.test import TestCase diff --git a/tests/m2m_regress/tests.py b/tests/m2m_regress/tests.py index 3c882c595a..6d4a4f02ed 100644 --- a/tests/m2m_regress/tests.py +++ b/tests/m2m_regress/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.exceptions import FieldError from django.test import TestCase diff --git a/tests/m2m_through/tests.py b/tests/m2m_through/tests.py index 47cbbeecda..0890188703 100644 --- a/tests/m2m_through/tests.py +++ b/tests/m2m_through/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from datetime import datetime from operator import attrgetter diff --git a/tests/m2m_through_regress/models.py b/tests/m2m_through_regress/models.py index adde24dcf9..9f0f44cd21 100644 --- a/tests/m2m_through_regress/models.py +++ b/tests/m2m_through_regress/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/m2m_through_regress/test_multitable.py b/tests/m2m_through_regress/test_multitable.py index f07af40f6d..1ae76376fc 100644 --- a/tests/m2m_through_regress/test_multitable.py +++ b/tests/m2m_through_regress/test_multitable.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.test import TestCase from .models import ( diff --git a/tests/m2m_through_regress/tests.py b/tests/m2m_through_regress/tests.py index ca47830290..a1739f2960 100644 --- a/tests/m2m_through_regress/tests.py +++ b/tests/m2m_through_regress/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.auth.models import User from django.core import management from django.test import TestCase diff --git a/tests/m2o_recursive/tests.py b/tests/m2o_recursive/tests.py index 8e730d48a7..0f7ee9071d 100644 --- a/tests/m2o_recursive/tests.py +++ b/tests/m2o_recursive/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.test import TestCase from .models import Category, Person diff --git a/tests/mail/test_sendtestemail.py b/tests/mail/test_sendtestemail.py index b1494bf3df..d7457c9a1c 100644 --- a/tests/mail/test_sendtestemail.py +++ b/tests/mail/test_sendtestemail.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core import mail from django.core.management import call_command from django.test import SimpleTestCase, override_settings diff --git a/tests/mail/tests.py b/tests/mail/tests.py index fd2a185fb5..ba7ff44714 100644 --- a/tests/mail/tests.py +++ b/tests/mail/tests.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import asyncore import base64 import mimetypes diff --git a/tests/managers_regress/tests.py b/tests/managers_regress/tests.py index cda90ac2b6..1b3e0a1635 100644 --- a/tests/managers_regress/tests.py +++ b/tests/managers_regress/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import models from django.template import Context, Template from django.test import TestCase, override_settings diff --git a/tests/many_to_many/models.py b/tests/many_to_many/models.py index a199cd77e2..b0e708ebb4 100644 --- a/tests/many_to_many/models.py +++ b/tests/many_to_many/models.py @@ -6,8 +6,6 @@ To define a many-to-many relationship, use ``ManyToManyField()``. In this example, an ``Article`` can be published in multiple ``Publication`` objects, and a ``Publication`` has multiple ``Article`` objects. """ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/many_to_many/tests.py b/tests/many_to_many/tests.py index e5bc51be47..d81d88b176 100644 --- a/tests/many_to_many/tests.py +++ b/tests/many_to_many/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import transaction from django.test import TestCase diff --git a/tests/many_to_one/models.py b/tests/many_to_one/models.py index abc9c7d826..09578b56a3 100644 --- a/tests/many_to_one/models.py +++ b/tests/many_to_one/models.py @@ -3,8 +3,6 @@ Many-to-one relationships To define a many-to-one relationship, use ``ForeignKey()``. """ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/many_to_one_null/tests.py b/tests/many_to_one_null/tests.py index dc49c61f69..77b8fd7c25 100644 --- a/tests/many_to_one_null/tests.py +++ b/tests/many_to_one_null/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.test import TestCase from .models import Article, Car, Driver, Reporter diff --git a/tests/max_lengths/tests.py b/tests/max_lengths/tests.py index fa3cd4bddc..fb81a7f473 100644 --- a/tests/max_lengths/tests.py +++ b/tests/max_lengths/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import unittest from .models import PersonWithCustomMaxLengths, PersonWithDefaultMaxLengths diff --git a/tests/middleware/tests.py b/tests/middleware/tests.py index 1d473ef558..43ea0748a0 100644 --- a/tests/middleware/tests.py +++ b/tests/middleware/tests.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import gzip import random import re diff --git a/tests/middleware_exceptions/middleware.py b/tests/middleware_exceptions/middleware.py index b1de76a5ce..e704b9f2b5 100644 --- a/tests/middleware_exceptions/middleware.py +++ b/tests/middleware_exceptions/middleware.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.http import Http404, HttpResponse from django.template import engines from django.template.response import TemplateResponse diff --git a/tests/migrate_signals/custom_migrations/0001_initial.py b/tests/migrate_signals/custom_migrations/0001_initial.py index 6e969d29ed..91b106ef0c 100644 --- a/tests/migrate_signals/custom_migrations/0001_initial.py +++ b/tests/migrate_signals/custom_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/tests/migration_test_data_persistence/migrations/0001_initial.py b/tests/migration_test_data_persistence/migrations/0001_initial.py index 6c19c4c81c..0f455ed43b 100644 --- a/tests/migration_test_data_persistence/migrations/0001_initial.py +++ b/tests/migration_test_data_persistence/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/tests/migration_test_data_persistence/migrations/0002_add_book.py b/tests/migration_test_data_persistence/migrations/0002_add_book.py index 6ce7fff26b..51c13effd9 100644 --- a/tests/migration_test_data_persistence/migrations/0002_add_book.py +++ b/tests/migration_test_data_persistence/migrations/0002_add_book.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/deprecated_field_migrations/0001_initial.py b/tests/migrations/deprecated_field_migrations/0001_initial.py index 624ea68016..8665d5b2ff 100644 --- a/tests/migrations/deprecated_field_migrations/0001_initial.py +++ b/tests/migrations/deprecated_field_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/tests/migrations/deprecated_field_migrations/0002_remove_ipaddressfield_ip.py b/tests/migrations/deprecated_field_migrations/0002_remove_ipaddressfield_ip.py index 12e9739bca..1b27bf536d 100644 --- a/tests/migrations/deprecated_field_migrations/0002_remove_ipaddressfield_ip.py +++ b/tests/migrations/deprecated_field_migrations/0002_remove_ipaddressfield_ip.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/migrations_test_apps/alter_fk/author_app/migrations/0001_initial.py b/tests/migrations/migrations_test_apps/alter_fk/author_app/migrations/0001_initial.py index 8df44dfeef..48664b2a04 100644 --- a/tests/migrations/migrations_test_apps/alter_fk/author_app/migrations/0001_initial.py +++ b/tests/migrations/migrations_test_apps/alter_fk/author_app/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/tests/migrations/migrations_test_apps/alter_fk/author_app/migrations/0002_alter_id.py b/tests/migrations/migrations_test_apps/alter_fk/author_app/migrations/0002_alter_id.py index ffce7dbd70..18bc91ad72 100644 --- a/tests/migrations/migrations_test_apps/alter_fk/author_app/migrations/0002_alter_id.py +++ b/tests/migrations/migrations_test_apps/alter_fk/author_app/migrations/0002_alter_id.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/migrations_test_apps/alter_fk/book_app/migrations/0001_initial.py b/tests/migrations/migrations_test_apps/alter_fk/book_app/migrations/0001_initial.py index 7769e4b32a..46543caeee 100644 --- a/tests/migrations/migrations_test_apps/alter_fk/book_app/migrations/0001_initial.py +++ b/tests/migrations/migrations_test_apps/alter_fk/book_app/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/tests/migrations/migrations_test_apps/conflicting_app_with_dependencies/migrations/0001_initial.py b/tests/migrations/migrations_test_apps/conflicting_app_with_dependencies/migrations/0001_initial.py index 146d6cee3e..ddf070a8cd 100644 --- a/tests/migrations/migrations_test_apps/conflicting_app_with_dependencies/migrations/0001_initial.py +++ b/tests/migrations/migrations_test_apps/conflicting_app_with_dependencies/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/tests/migrations/migrations_test_apps/conflicting_app_with_dependencies/migrations/0002_conflicting_second.py b/tests/migrations/migrations_test_apps/conflicting_app_with_dependencies/migrations/0002_conflicting_second.py index cbe5bfb13e..16fd7dbfee 100644 --- a/tests/migrations/migrations_test_apps/conflicting_app_with_dependencies/migrations/0002_conflicting_second.py +++ b/tests/migrations/migrations_test_apps/conflicting_app_with_dependencies/migrations/0002_conflicting_second.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/migrations_test_apps/conflicting_app_with_dependencies/migrations/0002_second.py b/tests/migrations/migrations_test_apps/conflicting_app_with_dependencies/migrations/0002_second.py index 16d42f8736..d612af5726 100644 --- a/tests/migrations/migrations_test_apps/conflicting_app_with_dependencies/migrations/0002_second.py +++ b/tests/migrations/migrations_test_apps/conflicting_app_with_dependencies/migrations/0002_second.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/migrations_test_apps/lookuperror_a/migrations/0001_initial.py b/tests/migrations/migrations_test_apps/lookuperror_a/migrations/0001_initial.py index 09cda3c61f..6351b0d212 100644 --- a/tests/migrations/migrations_test_apps/lookuperror_a/migrations/0001_initial.py +++ b/tests/migrations/migrations_test_apps/lookuperror_a/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/tests/migrations/migrations_test_apps/lookuperror_a/migrations/0002_a2.py b/tests/migrations/migrations_test_apps/lookuperror_a/migrations/0002_a2.py index e528f9ee5e..ab943b9c77 100644 --- a/tests/migrations/migrations_test_apps/lookuperror_a/migrations/0002_a2.py +++ b/tests/migrations/migrations_test_apps/lookuperror_a/migrations/0002_a2.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/migrations_test_apps/lookuperror_a/migrations/0003_a3.py b/tests/migrations/migrations_test_apps/lookuperror_a/migrations/0003_a3.py index 8dd1bf977b..42b5853d3c 100644 --- a/tests/migrations/migrations_test_apps/lookuperror_a/migrations/0003_a3.py +++ b/tests/migrations/migrations_test_apps/lookuperror_a/migrations/0003_a3.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/migrations_test_apps/lookuperror_a/migrations/0004_a4.py b/tests/migrations/migrations_test_apps/lookuperror_a/migrations/0004_a4.py index 5a1ebfb684..b7a0bcb8a7 100644 --- a/tests/migrations/migrations_test_apps/lookuperror_a/migrations/0004_a4.py +++ b/tests/migrations/migrations_test_apps/lookuperror_a/migrations/0004_a4.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/migrations_test_apps/lookuperror_b/migrations/0001_initial.py b/tests/migrations/migrations_test_apps/lookuperror_b/migrations/0001_initial.py index 9cd50e24b8..def52ae789 100644 --- a/tests/migrations/migrations_test_apps/lookuperror_b/migrations/0001_initial.py +++ b/tests/migrations/migrations_test_apps/lookuperror_b/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/tests/migrations/migrations_test_apps/lookuperror_b/migrations/0002_b2.py b/tests/migrations/migrations_test_apps/lookuperror_b/migrations/0002_b2.py index 7e91505cd2..a2ac5e1ba7 100644 --- a/tests/migrations/migrations_test_apps/lookuperror_b/migrations/0002_b2.py +++ b/tests/migrations/migrations_test_apps/lookuperror_b/migrations/0002_b2.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/migrations_test_apps/lookuperror_b/migrations/0003_b3.py b/tests/migrations/migrations_test_apps/lookuperror_b/migrations/0003_b3.py index 746c49d0a1..1c76e73ec1 100644 --- a/tests/migrations/migrations_test_apps/lookuperror_b/migrations/0003_b3.py +++ b/tests/migrations/migrations_test_apps/lookuperror_b/migrations/0003_b3.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/migrations_test_apps/lookuperror_c/migrations/0001_initial.py b/tests/migrations/migrations_test_apps/lookuperror_c/migrations/0001_initial.py index bf9ec3d171..8453148b87 100644 --- a/tests/migrations/migrations_test_apps/lookuperror_c/migrations/0001_initial.py +++ b/tests/migrations/migrations_test_apps/lookuperror_c/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/tests/migrations/migrations_test_apps/lookuperror_c/migrations/0002_c2.py b/tests/migrations/migrations_test_apps/lookuperror_c/migrations/0002_c2.py index ca557688aa..a928da9ae0 100644 --- a/tests/migrations/migrations_test_apps/lookuperror_c/migrations/0002_c2.py +++ b/tests/migrations/migrations_test_apps/lookuperror_c/migrations/0002_c2.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/migrations_test_apps/lookuperror_c/migrations/0003_c3.py b/tests/migrations/migrations_test_apps/lookuperror_c/migrations/0003_c3.py index f226cad458..58119ac8ac 100644 --- a/tests/migrations/migrations_test_apps/lookuperror_c/migrations/0003_c3.py +++ b/tests/migrations/migrations_test_apps/lookuperror_c/migrations/0003_c3.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/migrations_test_apps/migrated_app/migrations/0001_initial.py b/tests/migrations/migrations_test_apps/migrated_app/migrations/0001_initial.py index 581d536814..344bebdfe3 100644 --- a/tests/migrations/migrations_test_apps/migrated_app/migrations/0001_initial.py +++ b/tests/migrations/migrations_test_apps/migrated_app/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/tests/migrations/migrations_test_apps/migrated_unapplied_app/migrations/0001_initial.py b/tests/migrations/migrations_test_apps/migrated_unapplied_app/migrations/0001_initial.py index 4913065b10..800ceed7e4 100644 --- a/tests/migrations/migrations_test_apps/migrated_unapplied_app/migrations/0001_initial.py +++ b/tests/migrations/migrations_test_apps/migrated_unapplied_app/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/tests/migrations/migrations_test_apps/mutate_state_a/migrations/0001_initial.py b/tests/migrations/migrations_test_apps/mutate_state_a/migrations/0001_initial.py index 5fac74abf3..37c9bf7377 100644 --- a/tests/migrations/migrations_test_apps/mutate_state_a/migrations/0001_initial.py +++ b/tests/migrations/migrations_test_apps/mutate_state_a/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/tests/migrations/migrations_test_apps/mutate_state_b/migrations/0001_initial.py b/tests/migrations/migrations_test_apps/mutate_state_b/migrations/0001_initial.py index 73f436b20d..51c022dd7f 100644 --- a/tests/migrations/migrations_test_apps/mutate_state_b/migrations/0001_initial.py +++ b/tests/migrations/migrations_test_apps/mutate_state_b/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/tests/migrations/migrations_test_apps/mutate_state_b/migrations/0002_add_field.py b/tests/migrations/migrations_test_apps/mutate_state_b/migrations/0002_add_field.py index 45aca30740..ae968382eb 100644 --- a/tests/migrations/migrations_test_apps/mutate_state_b/migrations/0002_add_field.py +++ b/tests/migrations/migrations_test_apps/mutate_state_b/migrations/0002_add_field.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/migrations_test_apps/unmigrated_app/models.py b/tests/migrations/migrations_test_apps/unmigrated_app/models.py index 793e03829f..03d397c45b 100644 --- a/tests/migrations/migrations_test_apps/unmigrated_app/models.py +++ b/tests/migrations/migrations_test_apps/unmigrated_app/models.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import models diff --git a/tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/0001_initial.py b/tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/0001_initial.py index 581d536814..344bebdfe3 100644 --- a/tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/0001_initial.py +++ b/tests/migrations/migrations_test_apps/unspecified_app_with_conflict/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/tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/0002_conflicting_second.py b/tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/0002_conflicting_second.py index 43e03165e8..ad44031030 100644 --- a/tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/0002_conflicting_second.py +++ b/tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/0002_conflicting_second.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/0002_second.py b/tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/0002_second.py index cb8cfc96d2..fbf5a9110c 100644 --- a/tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/0002_second.py +++ b/tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/0002_second.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/models.py b/tests/migrations/models.py index 6f02e8088e..b1a10210b6 100644 --- a/tests/migrations/models.py +++ b/tests/migrations/models.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.apps.registry import Apps from django.db import models from django.utils import six diff --git a/tests/migrations/test_add_many_to_many_field_initial/0001_initial.py b/tests/migrations/test_add_many_to_many_field_initial/0001_initial.py index b50b3c68b8..50fd06a35f 100644 --- a/tests/migrations/test_add_many_to_many_field_initial/0001_initial.py +++ b/tests/migrations/test_add_many_to_many_field_initial/0001_initial.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_add_many_to_many_field_initial/0002_initial.py b/tests/migrations/test_add_many_to_many_field_initial/0002_initial.py index 65739a5bb4..1bc6c8aafa 100644 --- a/tests/migrations/test_add_many_to_many_field_initial/0002_initial.py +++ b/tests/migrations/test_add_many_to_many_field_initial/0002_initial.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_auto_now_add/0001_initial.py b/tests/migrations/test_auto_now_add/0001_initial.py index f966cc0e7b..f1bfb44657 100644 --- a/tests/migrations/test_auto_now_add/0001_initial.py +++ b/tests/migrations/test_auto_now_add/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_autodetector.py b/tests/migrations/test_autodetector.py index bf31831071..e30aeb5d19 100644 --- a/tests/migrations/test_autodetector.py +++ b/tests/migrations/test_autodetector.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- import functools import re diff --git a/tests/migrations/test_commands.py b/tests/migrations/test_commands.py index fd483b7f85..ab2e47fabd 100644 --- a/tests/migrations/test_commands.py +++ b/tests/migrations/test_commands.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import datetime import importlib import io @@ -661,7 +658,6 @@ class MakeMigrationsTests(MigrationTestBase): with io.open(initial_file, 'r', encoding='utf-8') as fp: content = fp.read() - self.assertIn('# -*- coding: utf-8 -*-', content) self.assertIn('migrations.CreateModel', content) self.assertIn('initial = True', content) @@ -813,7 +809,6 @@ class MakeMigrationsTests(MigrationTestBase): with io.open(initial_file, 'r', encoding='utf-8') as fp: content = fp.read() - self.assertIn('# -*- coding: utf-8 -*-', content) # Remove all whitespace to check for empty dependencies and operations content = content.replace(' ', '') @@ -1040,8 +1035,6 @@ class MakeMigrationsTests(MigrationTestBase): # Additional output caused by verbosity 3 # The complete merge migration file that would be written - # '\n#' is to verify no bytestring prefix before # - self.assertIn("\n# -*- coding: utf-8 -*-", output) self.assertIn("class Migration(migrations.Migration):", output) self.assertIn("dependencies = [", output) self.assertIn("('migrations', '0002_second')", output) @@ -1087,7 +1080,6 @@ class MakeMigrationsTests(MigrationTestBase): # Additional output caused by verbosity 3 # The complete migrations file that would be written - self.assertIn("# -*- coding: utf-8 -*-", out.getvalue()) self.assertIn("class Migration(migrations.Migration):", out.getvalue()) self.assertIn("dependencies = [", out.getvalue()) self.assertIn("('migrations', '0001_initial'),", out.getvalue()) @@ -1211,7 +1203,6 @@ class MakeMigrationsTests(MigrationTestBase): self.assertTrue(os.path.exists(migration_file)) with io.open(migration_file, "r", encoding="utf-8") as fp: content = fp.read() - self.assertIn("# -*- coding: utf-8 -*-", content) content = content.replace(" ", "") return content diff --git a/tests/migrations/test_loader.py b/tests/migrations/test_loader.py index b464209a98..6c91a50430 100644 --- a/tests/migrations/test_loader.py +++ b/tests/migrations/test_loader.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from unittest import skipIf from django.db import connection, connections diff --git a/tests/migrations/test_migrations/0001_initial.py b/tests/migrations/test_migrations/0001_initial.py index 1fa9664f6a..8572afa1aa 100644 --- a/tests/migrations/test_migrations/0001_initial.py +++ b/tests/migrations/test_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/tests/migrations/test_migrations/0002_second.py b/tests/migrations/test_migrations/0002_second.py index 898676c9d8..71c300cead 100644 --- a/tests/migrations/test_migrations/0002_second.py +++ b/tests/migrations/test_migrations/0002_second.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_atomic_operation/0001_initial.py b/tests/migrations/test_migrations_atomic_operation/0001_initial.py index 11bd2f7ce2..415186423f 100644 --- a/tests/migrations/test_migrations_atomic_operation/0001_initial.py +++ b/tests/migrations/test_migrations_atomic_operation/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_backwards_deps_1/0001_initial.py b/tests/migrations/test_migrations_backwards_deps_1/0001_initial.py index cb6f0891fd..de3ea27173 100644 --- a/tests/migrations/test_migrations_backwards_deps_1/0001_initial.py +++ b/tests/migrations/test_migrations_backwards_deps_1/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_backwards_deps_1/0002_second.py b/tests/migrations/test_migrations_backwards_deps_1/0002_second.py index 41d6684f9d..6eb831e061 100644 --- a/tests/migrations/test_migrations_backwards_deps_1/0002_second.py +++ b/tests/migrations/test_migrations_backwards_deps_1/0002_second.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_conflict/0001_initial.py b/tests/migrations/test_migrations_conflict/0001_initial.py index 581d536814..344bebdfe3 100644 --- a/tests/migrations/test_migrations_conflict/0001_initial.py +++ b/tests/migrations/test_migrations_conflict/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_conflict/0002_conflicting_second.py b/tests/migrations/test_migrations_conflict/0002_conflicting_second.py index 4057636177..15ea1f063a 100644 --- a/tests/migrations/test_migrations_conflict/0002_conflicting_second.py +++ b/tests/migrations/test_migrations_conflict/0002_conflicting_second.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_conflict/0002_second.py b/tests/migrations/test_migrations_conflict/0002_second.py index e5fed5df13..60a6999ee4 100644 --- a/tests/migrations/test_migrations_conflict/0002_second.py +++ b/tests/migrations/test_migrations_conflict/0002_second.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_custom_user/0001_initial.py b/tests/migrations/test_migrations_custom_user/0001_initial.py index dd1b6bc219..250aa9f51b 100644 --- a/tests/migrations/test_migrations_custom_user/0001_initial.py +++ b/tests/migrations/test_migrations_custom_user/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.conf import settings from django.db import migrations, models diff --git a/tests/migrations/test_migrations_fake_split_initial/0001_initial.py b/tests/migrations/test_migrations_fake_split_initial/0001_initial.py index 1f42af2fb8..2079c10be8 100644 --- a/tests/migrations/test_migrations_fake_split_initial/0001_initial.py +++ b/tests/migrations/test_migrations_fake_split_initial/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_fake_split_initial/0002_second.py b/tests/migrations/test_migrations_fake_split_initial/0002_second.py index 6730f1c65a..6e9b28efb4 100644 --- a/tests/migrations/test_migrations_fake_split_initial/0002_second.py +++ b/tests/migrations/test_migrations_fake_split_initial/0002_second.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_first/second.py b/tests/migrations/test_migrations_first/second.py index d0929e6a6f..e4cf995dcc 100644 --- a/tests/migrations/test_migrations_first/second.py +++ b/tests/migrations/test_migrations_first/second.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_first/thefirst.py b/tests/migrations/test_migrations_first/thefirst.py index 581d536814..344bebdfe3 100644 --- a/tests/migrations/test_migrations_first/thefirst.py +++ b/tests/migrations/test_migrations_first/thefirst.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_initial_false/0001_not_initial.py b/tests/migrations/test_migrations_initial_false/0001_not_initial.py index 9345321776..5347ad2934 100644 --- a/tests/migrations/test_migrations_initial_false/0001_not_initial.py +++ b/tests/migrations/test_migrations_initial_false/0001_not_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_no_ancestor/0001_initial.py b/tests/migrations/test_migrations_no_ancestor/0001_initial.py index 581d536814..344bebdfe3 100644 --- a/tests/migrations/test_migrations_no_ancestor/0001_initial.py +++ b/tests/migrations/test_migrations_no_ancestor/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_no_ancestor/0002_conflicting_second.py b/tests/migrations/test_migrations_no_ancestor/0002_conflicting_second.py index 3e8b270599..71625a7116 100644 --- a/tests/migrations/test_migrations_no_ancestor/0002_conflicting_second.py +++ b/tests/migrations/test_migrations_no_ancestor/0002_conflicting_second.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_no_ancestor/0002_second.py b/tests/migrations/test_migrations_no_ancestor/0002_second.py index 898676c9d8..71c300cead 100644 --- a/tests/migrations/test_migrations_no_ancestor/0002_second.py +++ b/tests/migrations/test_migrations_no_ancestor/0002_second.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_no_changes/0001_initial.py b/tests/migrations/test_migrations_no_changes/0001_initial.py index 581d536814..344bebdfe3 100644 --- a/tests/migrations/test_migrations_no_changes/0001_initial.py +++ b/tests/migrations/test_migrations_no_changes/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_no_changes/0002_second.py b/tests/migrations/test_migrations_no_changes/0002_second.py index 898676c9d8..71c300cead 100644 --- a/tests/migrations/test_migrations_no_changes/0002_second.py +++ b/tests/migrations/test_migrations_no_changes/0002_second.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_no_changes/0003_third.py b/tests/migrations/test_migrations_no_changes/0003_third.py index 05b7535dc3..89b3bc030c 100644 --- a/tests/migrations/test_migrations_no_changes/0003_third.py +++ b/tests/migrations/test_migrations_no_changes/0003_third.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_no_default/0001_initial.py b/tests/migrations/test_migrations_no_default/0001_initial.py index 2fd027f2d2..e9176c4958 100644 --- a/tests/migrations/test_migrations_no_default/0001_initial.py +++ b/tests/migrations/test_migrations_no_default/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_non_atomic/0001_initial.py b/tests/migrations/test_migrations_non_atomic/0001_initial.py index 47a03a16f9..f1aa1ae371 100644 --- a/tests/migrations/test_migrations_non_atomic/0001_initial.py +++ b/tests/migrations/test_migrations_non_atomic/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_order/0001.py b/tests/migrations/test_migrations_order/0001.py index 402c13e7f6..2ef88e957d 100644 --- a/tests/migrations/test_migrations_order/0001.py +++ b/tests/migrations/test_migrations_order/0001.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_run_before/0001_initial.py b/tests/migrations/test_migrations_run_before/0001_initial.py index 7d44a8d789..186c7fbec9 100644 --- a/tests/migrations/test_migrations_run_before/0001_initial.py +++ b/tests/migrations/test_migrations_run_before/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_run_before/0002_second.py b/tests/migrations/test_migrations_run_before/0002_second.py index 6f1fbdd6a1..2be86bb439 100644 --- a/tests/migrations/test_migrations_run_before/0002_second.py +++ b/tests/migrations/test_migrations_run_before/0002_second.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_run_before/0003_third.py b/tests/migrations/test_migrations_run_before/0003_third.py index d5c098c730..d24d28ca1c 100644 --- a/tests/migrations/test_migrations_run_before/0003_third.py +++ b/tests/migrations/test_migrations_run_before/0003_third.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_squashed/0001_initial.py b/tests/migrations/test_migrations_squashed/0001_initial.py index 581d536814..344bebdfe3 100644 --- a/tests/migrations/test_migrations_squashed/0001_initial.py +++ b/tests/migrations/test_migrations_squashed/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_squashed/0001_squashed_0002.py b/tests/migrations/test_migrations_squashed/0001_squashed_0002.py index 3b87c54da4..1ba7f45e41 100644 --- a/tests/migrations/test_migrations_squashed/0001_squashed_0002.py +++ b/tests/migrations/test_migrations_squashed/0001_squashed_0002.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_squashed/0002_second.py b/tests/migrations/test_migrations_squashed/0002_second.py index e5fed5df13..60a6999ee4 100644 --- a/tests/migrations/test_migrations_squashed/0002_second.py +++ b/tests/migrations/test_migrations_squashed/0002_second.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_migrations_squashed_complex/1_auto.py b/tests/migrations/test_migrations_squashed_complex/1_auto.py index bf12688063..46fc1242c9 100644 --- a/tests/migrations/test_migrations_squashed_complex/1_auto.py +++ b/tests/migrations/test_migrations_squashed_complex/1_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_complex/2_auto.py b/tests/migrations/test_migrations_squashed_complex/2_auto.py index 1d952ad0df..1964bf8167 100644 --- a/tests/migrations/test_migrations_squashed_complex/2_auto.py +++ b/tests/migrations/test_migrations_squashed_complex/2_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_complex/3_auto.py b/tests/migrations/test_migrations_squashed_complex/3_auto.py index d780968115..994ddf3619 100644 --- a/tests/migrations/test_migrations_squashed_complex/3_auto.py +++ b/tests/migrations/test_migrations_squashed_complex/3_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_complex/3_squashed_5.py b/tests/migrations/test_migrations_squashed_complex/3_squashed_5.py index f7dde03524..e8f1eb527e 100644 --- a/tests/migrations/test_migrations_squashed_complex/3_squashed_5.py +++ b/tests/migrations/test_migrations_squashed_complex/3_squashed_5.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_complex/4_auto.py b/tests/migrations/test_migrations_squashed_complex/4_auto.py index c39b16e454..e7d0f09b55 100644 --- a/tests/migrations/test_migrations_squashed_complex/4_auto.py +++ b/tests/migrations/test_migrations_squashed_complex/4_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_complex/5_auto.py b/tests/migrations/test_migrations_squashed_complex/5_auto.py index 754fe2d253..e7e25d9a71 100644 --- a/tests/migrations/test_migrations_squashed_complex/5_auto.py +++ b/tests/migrations/test_migrations_squashed_complex/5_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_complex/6_auto.py b/tests/migrations/test_migrations_squashed_complex/6_auto.py index 65d829cd32..4438bb4196 100644 --- a/tests/migrations/test_migrations_squashed_complex/6_auto.py +++ b/tests/migrations/test_migrations_squashed_complex/6_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_complex/7_auto.py b/tests/migrations/test_migrations_squashed_complex/7_auto.py index f1b3cd3e49..f231edfed1 100644 --- a/tests/migrations/test_migrations_squashed_complex/7_auto.py +++ b/tests/migrations/test_migrations_squashed_complex/7_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/1_auto.py b/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/1_auto.py index bf12688063..46fc1242c9 100644 --- a/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/1_auto.py +++ b/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/1_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/2_auto.py b/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/2_auto.py index 13a844275b..83d6e0bedc 100644 --- a/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/2_auto.py +++ b/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/2_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/2_squashed_3.py b/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/2_squashed_3.py index 521e70f5d2..838f68f99f 100644 --- a/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/2_squashed_3.py +++ b/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/2_squashed_3.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/3_auto.py b/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/3_auto.py index aa0e86e560..8abccb5bed 100644 --- a/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/3_auto.py +++ b/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/3_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/4_auto.py b/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/4_auto.py index 145e495a18..3b44a1d0ab 100644 --- a/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/4_auto.py +++ b/tests/migrations/test_migrations_squashed_complex_multi_apps/app1/4_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_auto.py b/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_auto.py index 13a844275b..83d6e0bedc 100644 --- a/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_auto.py +++ b/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_squashed_2.py b/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_squashed_2.py index 6ef4dba71e..e12b5754ad 100644 --- a/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_squashed_2.py +++ b/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/1_squashed_2.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/2_auto.py b/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/2_auto.py index 35fc7b8c1c..6726beb9d5 100644 --- a/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/2_auto.py +++ b/tests/migrations/test_migrations_squashed_complex_multi_apps/app2/2_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_erroneous/1_auto.py b/tests/migrations/test_migrations_squashed_erroneous/1_auto.py index bf12688063..46fc1242c9 100644 --- a/tests/migrations/test_migrations_squashed_erroneous/1_auto.py +++ b/tests/migrations/test_migrations_squashed_erroneous/1_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_erroneous/2_auto.py b/tests/migrations/test_migrations_squashed_erroneous/2_auto.py index 1d952ad0df..1964bf8167 100644 --- a/tests/migrations/test_migrations_squashed_erroneous/2_auto.py +++ b/tests/migrations/test_migrations_squashed_erroneous/2_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_erroneous/3_squashed_5.py b/tests/migrations/test_migrations_squashed_erroneous/3_squashed_5.py index f7dde03524..e8f1eb527e 100644 --- a/tests/migrations/test_migrations_squashed_erroneous/3_squashed_5.py +++ b/tests/migrations/test_migrations_squashed_erroneous/3_squashed_5.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_erroneous/6_auto.py b/tests/migrations/test_migrations_squashed_erroneous/6_auto.py index 65d829cd32..4438bb4196 100644 --- a/tests/migrations/test_migrations_squashed_erroneous/6_auto.py +++ b/tests/migrations/test_migrations_squashed_erroneous/6_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_erroneous/7_auto.py b/tests/migrations/test_migrations_squashed_erroneous/7_auto.py index f1b3cd3e49..f231edfed1 100644 --- a/tests/migrations/test_migrations_squashed_erroneous/7_auto.py +++ b/tests/migrations/test_migrations_squashed_erroneous/7_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_extra/0001_initial.py b/tests/migrations/test_migrations_squashed_extra/0001_initial.py index 9a330e1067..bd613aa95e 100644 --- a/tests/migrations/test_migrations_squashed_extra/0001_initial.py +++ b/tests/migrations/test_migrations_squashed_extra/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_extra/0001_squashed_0002.py b/tests/migrations/test_migrations_squashed_extra/0001_squashed_0002.py index 79beebea1c..9d5581cc59 100644 --- a/tests/migrations/test_migrations_squashed_extra/0001_squashed_0002.py +++ b/tests/migrations/test_migrations_squashed_extra/0001_squashed_0002.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_extra/0002_second.py b/tests/migrations/test_migrations_squashed_extra/0002_second.py index 4b892a7e8b..5ca710feb6 100644 --- a/tests/migrations/test_migrations_squashed_extra/0002_second.py +++ b/tests/migrations/test_migrations_squashed_extra/0002_second.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_extra/0003_third.py b/tests/migrations/test_migrations_squashed_extra/0003_third.py index b69ae8883b..cf27aa2990 100644 --- a/tests/migrations/test_migrations_squashed_extra/0003_third.py +++ b/tests/migrations/test_migrations_squashed_extra/0003_third.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_ref_squashed/app1/1_auto.py b/tests/migrations/test_migrations_squashed_ref_squashed/app1/1_auto.py index 9a330e1067..bd613aa95e 100644 --- a/tests/migrations/test_migrations_squashed_ref_squashed/app1/1_auto.py +++ b/tests/migrations/test_migrations_squashed_ref_squashed/app1/1_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_ref_squashed/app1/2_auto.py b/tests/migrations/test_migrations_squashed_ref_squashed/app1/2_auto.py index 4428c73fc4..27d00f0cba 100644 --- a/tests/migrations/test_migrations_squashed_ref_squashed/app1/2_auto.py +++ b/tests/migrations/test_migrations_squashed_ref_squashed/app1/2_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_ref_squashed/app1/2_squashed_3.py b/tests/migrations/test_migrations_squashed_ref_squashed/app1/2_squashed_3.py index 80501ef177..c036174132 100644 --- a/tests/migrations/test_migrations_squashed_ref_squashed/app1/2_squashed_3.py +++ b/tests/migrations/test_migrations_squashed_ref_squashed/app1/2_squashed_3.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_ref_squashed/app1/3_auto.py b/tests/migrations/test_migrations_squashed_ref_squashed/app1/3_auto.py index 43863022a7..2203e4fdee 100644 --- a/tests/migrations/test_migrations_squashed_ref_squashed/app1/3_auto.py +++ b/tests/migrations/test_migrations_squashed_ref_squashed/app1/3_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_ref_squashed/app1/4_auto.py b/tests/migrations/test_migrations_squashed_ref_squashed/app1/4_auto.py index 6ce3ee7953..e9eddb1664 100644 --- a/tests/migrations/test_migrations_squashed_ref_squashed/app1/4_auto.py +++ b/tests/migrations/test_migrations_squashed_ref_squashed/app1/4_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_ref_squashed/app2/1_auto.py b/tests/migrations/test_migrations_squashed_ref_squashed/app2/1_auto.py index 4428c73fc4..27d00f0cba 100644 --- a/tests/migrations/test_migrations_squashed_ref_squashed/app2/1_auto.py +++ b/tests/migrations/test_migrations_squashed_ref_squashed/app2/1_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_ref_squashed/app2/1_squashed_2.py b/tests/migrations/test_migrations_squashed_ref_squashed/app2/1_squashed_2.py index aca9a46f61..ac24a30c85 100644 --- a/tests/migrations/test_migrations_squashed_ref_squashed/app2/1_squashed_2.py +++ b/tests/migrations/test_migrations_squashed_ref_squashed/app2/1_squashed_2.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_squashed_ref_squashed/app2/2_auto.py b/tests/migrations/test_migrations_squashed_ref_squashed/app2/2_auto.py index 77ab95584a..0b01988bbd 100644 --- a/tests/migrations/test_migrations_squashed_ref_squashed/app2/2_auto.py +++ b/tests/migrations/test_migrations_squashed_ref_squashed/app2/2_auto.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/tests/migrations/test_migrations_unmigdep/0001_initial.py b/tests/migrations/test_migrations_unmigdep/0001_initial.py index a47805bf68..91b58c3dad 100644 --- a/tests/migrations/test_migrations_unmigdep/0001_initial.py +++ b/tests/migrations/test_migrations_unmigdep/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations/test_operations.py b/tests/migrations/test_operations.py index e1daabe8b5..f962f9cf8c 100644 --- a/tests/migrations/test_operations.py +++ b/tests/migrations/test_operations.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import unittest from django.db import connection, migrations, models, transaction diff --git a/tests/migrations/test_optimizer.py b/tests/migrations/test_optimizer.py index fc4f0ac5d7..be2db97ba4 100644 --- a/tests/migrations/test_optimizer.py +++ b/tests/migrations/test_optimizer.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - from django.db import migrations, models from django.db.migrations import operations from django.db.migrations.optimizer import MigrationOptimizer diff --git a/tests/migrations/test_questioner.py b/tests/migrations/test_questioner.py index d5ba18a684..45536410bb 100644 --- a/tests/migrations/test_questioner.py +++ b/tests/migrations/test_questioner.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db.migrations.questioner import MigrationQuestioner from django.test import SimpleTestCase from django.test.utils import override_settings diff --git a/tests/migrations/test_writer.py b/tests/migrations/test_writer.py index f06a215747..c03d8cfd38 100644 --- a/tests/migrations/test_writer.py +++ b/tests/migrations/test_writer.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import datetime import decimal import functools @@ -662,7 +659,6 @@ class WriterTests(SimpleTestCase): self.assertTrue( output.startswith( - "# -*- coding: utf-8 -*-\n" "# Generated by Django %(version)s on 2015-07-31 04:40\n" % { 'version': get_version(), } diff --git a/tests/migrations2/test_migrations_2/0001_initial.py b/tests/migrations2/test_migrations_2/0001_initial.py index 02cbd97fcc..6172f011e8 100644 --- a/tests/migrations2/test_migrations_2/0001_initial.py +++ b/tests/migrations2/test_migrations_2/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations2/test_migrations_2_first/0001_initial.py b/tests/migrations2/test_migrations_2_first/0001_initial.py index e31d1d501f..a290372312 100644 --- a/tests/migrations2/test_migrations_2_first/0001_initial.py +++ b/tests/migrations2/test_migrations_2_first/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations2/test_migrations_2_first/0002_second.py b/tests/migrations2/test_migrations_2_first/0002_second.py index a3ca7dac39..67a422995d 100644 --- a/tests/migrations2/test_migrations_2_first/0002_second.py +++ b/tests/migrations2/test_migrations_2_first/0002_second.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/migrations2/test_migrations_2_no_deps/0001_initial.py b/tests/migrations2/test_migrations_2_no_deps/0001_initial.py index 2213706594..1314e3e1e1 100644 --- a/tests/migrations2/test_migrations_2_no_deps/0001_initial.py +++ b/tests/migrations2/test_migrations_2_no_deps/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/tests/model_fields/test_charfield.py b/tests/model_fields/test_charfield.py index 0bca108d22..04ac1d3f92 100644 --- a/tests/model_fields/test_charfield.py +++ b/tests/model_fields/test_charfield.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from unittest import skipIf from django.core.exceptions import ValidationError diff --git a/tests/model_fields/test_imagefield.py b/tests/model_fields/test_imagefield.py index e178760d2f..92985a99d9 100644 --- a/tests/model_fields/test_imagefield.py +++ b/tests/model_fields/test_imagefield.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import shutil from unittest import skipIf diff --git a/tests/model_fields/test_promises.py b/tests/model_fields/test_promises.py index 65d1b7ec99..bf5258cddf 100644 --- a/tests/model_fields/test_promises.py +++ b/tests/model_fields/test_promises.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import unittest from decimal import Decimal diff --git a/tests/model_fields/test_slugfield.py b/tests/model_fields/test_slugfield.py index 45a4527ad9..3dc955d3ad 100644 --- a/tests/model_fields/test_slugfield.py +++ b/tests/model_fields/test_slugfield.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.test import TestCase from .models import BigS, UnicodeSlugField diff --git a/tests/model_fields/test_textfield.py b/tests/model_fields/test_textfield.py index a3cd516cb4..a759b64648 100644 --- a/tests/model_fields/test_textfield.py +++ b/tests/model_fields/test_textfield.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from unittest import skipIf from django.db import connection, models diff --git a/tests/model_forms/models.py b/tests/model_forms/models.py index 3675e080fa..da91fc88b7 100644 --- a/tests/model_forms/models.py +++ b/tests/model_forms/models.py @@ -6,8 +6,6 @@ tests to use ``ModelForm``. As such, the text may not make sense in all cases, and the examples are probably a poor fit for the ``ModelForm`` syntax. In other words, most of these tests should be rewritten. """ -from __future__ import unicode_literals - import datetime import os import tempfile diff --git a/tests/model_forms/test_uuid.py b/tests/model_forms/test_uuid.py index b30da6d465..1c566efcd8 100644 --- a/tests/model_forms/test_uuid.py +++ b/tests/model_forms/test_uuid.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import forms from django.core.exceptions import ValidationError from django.test import TestCase diff --git a/tests/model_forms/tests.py b/tests/model_forms/tests.py index ef808f72f5..0fc516b55c 100644 --- a/tests/model_forms/tests.py +++ b/tests/model_forms/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import os from decimal import Decimal diff --git a/tests/model_formsets/models.py b/tests/model_formsets/models.py index 0bf56189a7..421d873704 100644 --- a/tests/model_formsets/models.py +++ b/tests/model_formsets/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import uuid diff --git a/tests/model_formsets/tests.py b/tests/model_formsets/tests.py index 4387fbf52d..b928944097 100644 --- a/tests/model_formsets/tests.py +++ b/tests/model_formsets/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import re from datetime import date diff --git a/tests/model_formsets_regress/tests.py b/tests/model_formsets_regress/tests.py index 1885ca7852..a9b50b3699 100644 --- a/tests/model_formsets_regress/tests.py +++ b/tests/model_formsets_regress/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import forms from django.forms.formsets import DELETION_FIELD_NAME, BaseFormSet from django.forms.models import ( diff --git a/tests/model_inheritance/models.py b/tests/model_inheritance/models.py index 45f22df0bc..4c7d4a7c8a 100644 --- a/tests/model_inheritance/models.py +++ b/tests/model_inheritance/models.py @@ -11,8 +11,6 @@ Model inheritance exists in two varieties: Both styles are demonstrated here. """ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/model_inheritance/test_abstract_inheritance.py b/tests/model_inheritance/test_abstract_inheritance.py index 71b8513a57..6f0b89128b 100644 --- a/tests/model_inheritance/test_abstract_inheritance.py +++ b/tests/model_inheritance/test_abstract_inheritance.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.contenttypes.fields import ( GenericForeignKey, GenericRelation, ) diff --git a/tests/model_inheritance/tests.py b/tests/model_inheritance/tests.py index 079fbb75c4..8bb74d7ccb 100644 --- a/tests/model_inheritance/tests.py +++ b/tests/model_inheritance/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from operator import attrgetter from django.core.exceptions import FieldError, ValidationError diff --git a/tests/model_inheritance_regress/models.py b/tests/model_inheritance_regress/models.py index 8481e21516..69ce0d9e2b 100644 --- a/tests/model_inheritance_regress/models.py +++ b/tests/model_inheritance_regress/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime from django.db import models diff --git a/tests/model_inheritance_regress/tests.py b/tests/model_inheritance_regress/tests.py index 3664fca44f..9cb710c4b8 100644 --- a/tests/model_inheritance_regress/tests.py +++ b/tests/model_inheritance_regress/tests.py @@ -1,8 +1,6 @@ """ Regression tests for Model inheritance behavior. """ -from __future__ import unicode_literals - import datetime from operator import attrgetter from unittest import expectedFailure diff --git a/tests/model_options/test_tablespaces.py b/tests/model_options/test_tablespaces.py index 2d4b9073e8..03a137603b 100644 --- a/tests/model_options/test_tablespaces.py +++ b/tests/model_options/test_tablespaces.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.apps import apps from django.conf import settings from django.db import connection diff --git a/tests/model_package/tests.py b/tests/model_package/tests.py index 9d1b81fa2a..bdb1cfba5a 100644 --- a/tests/model_package/tests.py +++ b/tests/model_package/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import connection, models from django.db.backends.utils import truncate_name from django.test import TestCase diff --git a/tests/model_regress/models.py b/tests/model_regress/models.py index e7c2b3a494..147116d7e2 100644 --- a/tests/model_regress/models.py +++ b/tests/model_regress/models.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/model_regress/tests.py b/tests/model_regress/tests.py index bd8e927be6..808729979f 100644 --- a/tests/model_regress/tests.py +++ b/tests/model_regress/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime from operator import attrgetter diff --git a/tests/modeladmin/models.py b/tests/modeladmin/models.py index 88a659795a..64cc86aa66 100644 --- a/tests/modeladmin/models.py +++ b/tests/modeladmin/models.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- 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/modeladmin/test_checks.py b/tests/modeladmin/test_checks.py index 0c66544b6b..93b35ecf56 100644 --- a/tests/modeladmin/test_checks.py +++ b/tests/modeladmin/test_checks.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import forms from django.contrib.admin import BooleanFieldListFilter, SimpleListFilter from django.contrib.admin.options import VERTICAL, ModelAdmin, TabularInline diff --git a/tests/modeladmin/tests.py b/tests/modeladmin/tests.py index 1f5d8a3236..12ca86ff1a 100644 --- a/tests/modeladmin/tests.py +++ b/tests/modeladmin/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from datetime import date from django import forms diff --git a/tests/multiple_database/routers.py b/tests/multiple_database/routers.py index e467cf563f..e51c82b858 100644 --- a/tests/multiple_database/routers.py +++ b/tests/multiple_database/routers.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import DEFAULT_DB_ALIAS diff --git a/tests/multiple_database/tests.py b/tests/multiple_database/tests.py index 0ea3b6667e..7e936216b7 100644 --- a/tests/multiple_database/tests.py +++ b/tests/multiple_database/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import pickle from operator import attrgetter diff --git a/tests/nested_foreign_keys/tests.py b/tests/nested_foreign_keys/tests.py index 34a3703e68..098023d23a 100644 --- a/tests/nested_foreign_keys/tests.py +++ b/tests/nested_foreign_keys/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.test import TestCase from .models import ( diff --git a/tests/null_fk/tests.py b/tests/null_fk/tests.py index 19b285e32a..e587d6551b 100644 --- a/tests/null_fk/tests.py +++ b/tests/null_fk/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db.models import Q from django.test import TestCase diff --git a/tests/null_fk_ordering/models.py b/tests/null_fk_ordering/models.py index 0bac5e1ab7..e65c227f88 100644 --- a/tests/null_fk_ordering/models.py +++ b/tests/null_fk_ordering/models.py @@ -5,8 +5,6 @@ Regression tests for proper working of ForeignKey(null=True). Tests these bugs: unexpected results """ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/null_fk_ordering/tests.py b/tests/null_fk_ordering/tests.py index 7215118b94..897c03063f 100644 --- a/tests/null_fk_ordering/tests.py +++ b/tests/null_fk_ordering/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.test import TestCase from .models import Article, Author, Comment, Forum, Post, SystemInfo diff --git a/tests/null_queries/models.py b/tests/null_queries/models.py index 8d915ba11f..b40f4539b3 100644 --- a/tests/null_queries/models.py +++ b/tests/null_queries/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/null_queries/tests.py b/tests/null_queries/tests.py index 8f58b9dee1..547b586e00 100644 --- a/tests/null_queries/tests.py +++ b/tests/null_queries/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.exceptions import FieldError from django.test import TestCase diff --git a/tests/one_to_one/models.py b/tests/one_to_one/models.py index 0f4aa70f6c..c58114dce8 100644 --- a/tests/one_to_one/models.py +++ b/tests/one_to_one/models.py @@ -5,8 +5,6 @@ To define a one-to-one relationship, use ``OneToOneField()``. In this example, a ``Place`` optionally can be a ``Restaurant``. """ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/one_to_one/tests.py b/tests/one_to_one/tests.py index 3d98d78c27..2fb118538d 100644 --- a/tests/one_to_one/tests.py +++ b/tests/one_to_one/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import IntegrityError, connection, transaction from django.test import TestCase diff --git a/tests/or_lookups/tests.py b/tests/or_lookups/tests.py index 5e8b3dd694..dd93ed7efc 100644 --- a/tests/or_lookups/tests.py +++ b/tests/or_lookups/tests.py @@ -1,6 +1,3 @@ -# -*- encoding: utf-8 -*- -from __future__ import unicode_literals - from datetime import datetime from operator import attrgetter diff --git a/tests/order_with_respect_to/base_tests.py b/tests/order_with_respect_to/base_tests.py index ed80ab13e5..ad8925bf88 100644 --- a/tests/order_with_respect_to/base_tests.py +++ b/tests/order_with_respect_to/base_tests.py @@ -2,8 +2,6 @@ The tests are shared with contenttypes_tests and so shouldn't import or reference any models directly. Subclasses should inherit django.test.TestCase. """ -from __future__ import unicode_literals - from operator import attrgetter diff --git a/tests/order_with_respect_to/tests.py b/tests/order_with_respect_to/tests.py index 7788fe3368..a047516caa 100644 --- a/tests/order_with_respect_to/tests.py +++ b/tests/order_with_respect_to/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from operator import attrgetter from django.db import models diff --git a/tests/ordering/tests.py b/tests/ordering/tests.py index 399b8d7035..de49626cf4 100644 --- a/tests/ordering/tests.py +++ b/tests/ordering/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from datetime import datetime from operator import attrgetter diff --git a/tests/pagination/tests.py b/tests/pagination/tests.py index 888cb813b0..fe967631ab 100644 --- a/tests/pagination/tests.py +++ b/tests/pagination/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import unittest from datetime import datetime diff --git a/tests/postgres_tests/array_default_migrations/0001_initial.py b/tests/postgres_tests/array_default_migrations/0001_initial.py index ebda628a5b..eb523218ef 100644 --- a/tests/postgres_tests/array_default_migrations/0001_initial.py +++ b/tests/postgres_tests/array_default_migrations/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import django.contrib.postgres.fields from django.db import migrations, models diff --git a/tests/postgres_tests/array_default_migrations/0002_integerarraymodel_field_2.py b/tests/postgres_tests/array_default_migrations/0002_integerarraymodel_field_2.py index 9526a96735..679c9bb0d3 100644 --- a/tests/postgres_tests/array_default_migrations/0002_integerarraymodel_field_2.py +++ b/tests/postgres_tests/array_default_migrations/0002_integerarraymodel_field_2.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import django.contrib.postgres.fields from django.db import migrations, models diff --git a/tests/postgres_tests/array_index_migrations/0001_initial.py b/tests/postgres_tests/array_index_migrations/0001_initial.py index 10c1780a46..505e53e4e8 100644 --- a/tests/postgres_tests/array_index_migrations/0001_initial.py +++ b/tests/postgres_tests/array_index_migrations/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import django.contrib.postgres.fields from django.db import migrations, models diff --git a/tests/postgres_tests/migrations/0001_setup_extensions.py b/tests/postgres_tests/migrations/0001_setup_extensions.py index 41628030b7..7add08c499 100644 --- a/tests/postgres_tests/migrations/0001_setup_extensions.py +++ b/tests/postgres_tests/migrations/0001_setup_extensions.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations try: diff --git a/tests/postgres_tests/migrations/0002_create_test_models.py b/tests/postgres_tests/migrations/0002_create_test_models.py index 8f72183f5c..489bedf298 100644 --- a/tests/postgres_tests/migrations/0002_create_test_models.py +++ b/tests/postgres_tests/migrations/0002_create_test_models.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.core.serializers.json import DjangoJSONEncoder from django.db import migrations, models diff --git a/tests/postgres_tests/test_hstore.py b/tests/postgres_tests/test_hstore.py index 0fc427f67c..2c6f93f1f6 100644 --- a/tests/postgres_tests/test_hstore.py +++ b/tests/postgres_tests/test_hstore.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import json from django.core import exceptions, serializers diff --git a/tests/postgres_tests/test_json.py b/tests/postgres_tests/test_json.py index 4e8851d485..2506fc36d6 100644 --- a/tests/postgres_tests/test_json.py +++ b/tests/postgres_tests/test_json.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import uuid from decimal import Decimal diff --git a/tests/postgres_tests/test_unaccent.py b/tests/postgres_tests/test_unaccent.py index e1e4171062..018aedb64c 100644 --- a/tests/postgres_tests/test_unaccent.py +++ b/tests/postgres_tests/test_unaccent.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.test import modify_settings from . import PostgreSQLTestCase diff --git a/tests/prefetch_related/test_uuid.py b/tests/prefetch_related/test_uuid.py index 08930fc5f4..11a2474f4a 100644 --- a/tests/prefetch_related/test_uuid.py +++ b/tests/prefetch_related/test_uuid.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.test import TestCase from .models import Flea, House, Person, Pet, Room diff --git a/tests/prefetch_related/tests.py b/tests/prefetch_related/tests.py index a6b5fd5cd3..126a8bc035 100644 --- a/tests/prefetch_related/tests.py +++ b/tests/prefetch_related/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ObjectDoesNotExist from django.db import connection diff --git a/tests/properties/tests.py b/tests/properties/tests.py index 175bf0eb83..a50a825953 100644 --- a/tests/properties/tests.py +++ b/tests/properties/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.test import TestCase from .models import Person diff --git a/tests/proxy_model_inheritance/tests.py b/tests/proxy_model_inheritance/tests.py index b4b1c13435..9bf8f1c04c 100644 --- a/tests/proxy_model_inheritance/tests.py +++ b/tests/proxy_model_inheritance/tests.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, unicode_literals - import os from django.core.management import call_command diff --git a/tests/proxy_models/tests.py b/tests/proxy_models/tests.py index 96d3c0914f..5fdfbfb6bf 100644 --- a/tests/proxy_models/tests.py +++ b/tests/proxy_models/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib import admin from django.contrib.auth.models import User as AuthUser from django.contrib.contenttypes.models import ContentType diff --git a/tests/queries/models.py b/tests/queries/models.py index 67a28e950e..8c1ba59b67 100644 --- a/tests/queries/models.py +++ b/tests/queries/models.py @@ -1,8 +1,6 @@ """ Various complex queries that have been problematic in the past. """ -from __future__ import unicode_literals - import threading from django.db import models diff --git a/tests/queries/test_qs_combinators.py b/tests/queries/test_qs_combinators.py index a0faab2eb7..02a0df216d 100644 --- a/tests/queries/test_qs_combinators.py +++ b/tests/queries/test_qs_combinators.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db.models import F, IntegerField, Value from django.db.utils import DatabaseError from django.test import TestCase, skipIfDBFeature, skipUnlessDBFeature diff --git a/tests/queries/tests.py b/tests/queries/tests.py index b0999be3f8..e2dd86bac1 100644 --- a/tests/queries/tests.py +++ b/tests/queries/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import pickle import unittest diff --git a/tests/queryset_pickle/tests.py b/tests/queryset_pickle/tests.py index d95878966a..9333e96fc3 100644 --- a/tests/queryset_pickle/tests.py +++ b/tests/queryset_pickle/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import pickle import unittest diff --git a/tests/raw_query/tests.py b/tests/raw_query/tests.py index 360dd31d5f..26b57dc139 100644 --- a/tests/raw_query/tests.py +++ b/tests/raw_query/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from datetime import date from decimal import Decimal diff --git a/tests/requests/tests.py b/tests/requests/tests.py index 27dc439e5f..c5a148ffbb 100644 --- a/tests/requests/tests.py +++ b/tests/requests/tests.py @@ -1,6 +1,3 @@ -# -*- encoding: utf-8 -*- -from __future__ import unicode_literals - import time from datetime import datetime, timedelta from io import BytesIO diff --git a/tests/reserved_names/tests.py b/tests/reserved_names/tests.py index 429bb01e2d..7e2510cd97 100644 --- a/tests/reserved_names/tests.py +++ b/tests/reserved_names/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime from django.test import TestCase diff --git a/tests/resolve_url/tests.py b/tests/resolve_url/tests.py index d56e08c97c..73556a93be 100644 --- a/tests/resolve_url/tests.py +++ b/tests/resolve_url/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.shortcuts import resolve_url from django.test import SimpleTestCase, override_settings from django.urls import NoReverseMatch, reverse_lazy diff --git a/tests/responses/tests.py b/tests/responses/tests.py index 5dba0e04cb..8adf092ca0 100644 --- a/tests/responses/tests.py +++ b/tests/responses/tests.py @@ -1,7 +1,3 @@ -# -*- coding: utf-8 -*- - -from __future__ import unicode_literals - import io from django.conf import settings diff --git a/tests/reverse_lookup/tests.py b/tests/reverse_lookup/tests.py index dda3c29691..0e0093f38e 100644 --- a/tests/reverse_lookup/tests.py +++ b/tests/reverse_lookup/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.exceptions import FieldError from django.test import TestCase diff --git a/tests/save_delete_hooks/models.py b/tests/save_delete_hooks/models.py index e6a155a8e7..3d229daada 100644 --- a/tests/save_delete_hooks/models.py +++ b/tests/save_delete_hooks/models.py @@ -4,8 +4,6 @@ Adding hooks before/after saving and deleting To execute arbitrary code around ``save()`` and ``delete()``, just subclass the methods. """ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/save_delete_hooks/tests.py b/tests/save_delete_hooks/tests.py index 0fd1ed4e03..e0cb2f51ab 100644 --- a/tests/save_delete_hooks/tests.py +++ b/tests/save_delete_hooks/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.test import TestCase from django.utils import six diff --git a/tests/select_for_update/tests.py b/tests/select_for_update/tests.py index 9e5ee598b0..7224124546 100644 --- a/tests/select_for_update/tests.py +++ b/tests/select_for_update/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import threading import time diff --git a/tests/select_related/tests.py b/tests/select_related/tests.py index d6c0c850df..04f762f657 100644 --- a/tests/select_related/tests.py +++ b/tests/select_related/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.exceptions import FieldError from django.test import SimpleTestCase, TestCase diff --git a/tests/select_related_onetoone/tests.py b/tests/select_related_onetoone/tests.py index a7d646e25d..5868dc807c 100644 --- a/tests/select_related_onetoone/tests.py +++ b/tests/select_related_onetoone/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.exceptions import FieldError from django.test import SimpleTestCase, TestCase diff --git a/tests/select_related_regress/models.py b/tests/select_related_regress/models.py index 8e748d3eef..4ac8cc1518 100644 --- a/tests/select_related_regress/models.py +++ b/tests/select_related_regress/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/select_related_regress/tests.py b/tests/select_related_regress/tests.py index 6c59192d2a..bb5f7774a3 100644 --- a/tests/select_related_regress/tests.py +++ b/tests/select_related_regress/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.test import TestCase from django.utils import six diff --git a/tests/serializers/models/base.py b/tests/serializers/models/base.py index 4889377e09..5f9bdd833c 100644 --- a/tests/serializers/models/base.py +++ b/tests/serializers/models/base.py @@ -4,8 +4,6 @@ Serialization ``django.core.serializers`` provides interfaces to converting Django ``QuerySet`` objects to and from "flat" data (i.e. strings). """ -from __future__ import unicode_literals - from decimal import Decimal from django.db import models diff --git a/tests/serializers/models/data.py b/tests/serializers/models/data.py index 9c44d97e6b..f6a1d108f6 100644 --- a/tests/serializers/models/data.py +++ b/tests/serializers/models/data.py @@ -4,8 +4,6 @@ The following classes are for testing basic data marshalling, including NULL values, where allowed. The basic idea is to have a model for each Django data type. """ -from __future__ import unicode_literals - from django.contrib.contenttypes.fields import ( GenericForeignKey, GenericRelation, ) diff --git a/tests/serializers/test_data.py b/tests/serializers/test_data.py index f9cb9582fe..2e9527f982 100644 --- a/tests/serializers/test_data.py +++ b/tests/serializers/test_data.py @@ -6,8 +6,6 @@ test case that is capable of testing the capabilities of the serializers. This includes all valid data values, plus forward, backwards and self references. """ -from __future__ import unicode_literals - import datetime import decimal import uuid diff --git a/tests/serializers/test_json.py b/tests/serializers/test_json.py index b191ce6644..7713e0c3c4 100644 --- a/tests/serializers/test_json.py +++ b/tests/serializers/test_json.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import datetime import decimal import json diff --git a/tests/serializers/test_natural.py b/tests/serializers/test_natural.py index 1a4f4d5ea0..c4e2bedf17 100644 --- a/tests/serializers/test_natural.py +++ b/tests/serializers/test_natural.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core import serializers from django.db import connection from django.test import TestCase diff --git a/tests/serializers/test_xml.py b/tests/serializers/test_xml.py index e516444c95..71b38d48fa 100644 --- a/tests/serializers/test_xml.py +++ b/tests/serializers/test_xml.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from xml.dom import minidom from django.core import serializers diff --git a/tests/serializers/test_yaml.py b/tests/serializers/test_yaml.py index 0b4b9b00d1..038227efea 100644 --- a/tests/serializers/test_yaml.py +++ b/tests/serializers/test_yaml.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import importlib import unittest diff --git a/tests/serializers/tests.py b/tests/serializers/tests.py index f765aea815..656bc4b4db 100644 --- a/tests/serializers/tests.py +++ b/tests/serializers/tests.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from datetime import datetime from django.core import serializers diff --git a/tests/servers/tests.py b/tests/servers/tests.py index 03e05d0957..ff1d4aff8c 100644 --- a/tests/servers/tests.py +++ b/tests/servers/tests.py @@ -1,9 +1,6 @@ -# -*- encoding: utf-8 -*- """ Tests for django.core.servers. """ -from __future__ import unicode_literals - import contextlib import errno import os diff --git a/tests/signals/models.py b/tests/signals/models.py index 2f76343ecf..4f8d72817c 100644 --- a/tests/signals/models.py +++ b/tests/signals/models.py @@ -1,8 +1,6 @@ """ Testing signals before/after saving and deleting. """ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/signals/tests.py b/tests/signals/tests.py index 7fd04df36a..9cb470b8cf 100644 --- a/tests/signals/tests.py +++ b/tests/signals/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.apps.registry import Apps from django.db import models from django.db.models import signals diff --git a/tests/signed_cookies_tests/tests.py b/tests/signed_cookies_tests/tests.py index 15b0a7c033..b7ea902bf4 100644 --- a/tests/signed_cookies_tests/tests.py +++ b/tests/signed_cookies_tests/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core import signing from django.http import HttpRequest, HttpResponse from django.test import SimpleTestCase, override_settings diff --git a/tests/signing/tests.py b/tests/signing/tests.py index e2677dfc1e..c6145d09cb 100644 --- a/tests/signing/tests.py +++ b/tests/signing/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime from django.core import signing diff --git a/tests/sitemaps_tests/test_generic.py b/tests/sitemaps_tests/test_generic.py index 96736c261a..db426e557f 100644 --- a/tests/sitemaps_tests/test_generic.py +++ b/tests/sitemaps_tests/test_generic.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.test import override_settings from .base import SitemapTestsBase diff --git a/tests/sitemaps_tests/test_http.py b/tests/sitemaps_tests/test_http.py index 8367b495d8..ec7d2be80f 100644 --- a/tests/sitemaps_tests/test_http.py +++ b/tests/sitemaps_tests/test_http.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os from datetime import date from unittest import skipUnless diff --git a/tests/sitemaps_tests/test_https.py b/tests/sitemaps_tests/test_https.py index 3b68baac43..ac6477f7a8 100644 --- a/tests/sitemaps_tests/test_https.py +++ b/tests/sitemaps_tests/test_https.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from datetime import date from django.test import override_settings diff --git a/tests/sites_framework/migrations/0001_initial.py b/tests/sites_framework/migrations/0001_initial.py index 78d26cab31..f4a2ba9460 100644 --- a/tests/sites_framework/migrations/0001_initial.py +++ b/tests/sites_framework/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/tests/sites_tests/tests.py b/tests/sites_tests/tests.py index 3ea66be9bb..0179500f14 100644 --- a/tests/sites_tests/tests.py +++ b/tests/sites_tests/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.apps import apps from django.apps.registry import Apps from django.conf import settings diff --git a/tests/staticfiles_tests/cases.py b/tests/staticfiles_tests/cases.py index 009672ee12..f278e6a974 100644 --- a/tests/staticfiles_tests/cases.py +++ b/tests/staticfiles_tests/cases.py @@ -1,6 +1,3 @@ -# -*- encoding: utf-8 -*- -from __future__ import unicode_literals - import codecs import os import shutil diff --git a/tests/staticfiles_tests/settings.py b/tests/staticfiles_tests/settings.py index caf42b2505..c9bf851db7 100644 --- a/tests/staticfiles_tests/settings.py +++ b/tests/staticfiles_tests/settings.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os.path from django.utils._os import upath diff --git a/tests/staticfiles_tests/test_finders.py b/tests/staticfiles_tests/test_finders.py index 7355113ad6..0f5cf5bea2 100644 --- a/tests/staticfiles_tests/test_finders.py +++ b/tests/staticfiles_tests/test_finders.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os from django.conf import settings diff --git a/tests/staticfiles_tests/test_management.py b/tests/staticfiles_tests/test_management.py index bbb8567c2a..ad608ea24b 100644 --- a/tests/staticfiles_tests/test_management.py +++ b/tests/staticfiles_tests/test_management.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import codecs import datetime import os diff --git a/tests/staticfiles_tests/test_storage.py b/tests/staticfiles_tests/test_storage.py index 4e1dec84f9..d1b7a49626 100644 --- a/tests/staticfiles_tests/test_storage.py +++ b/tests/staticfiles_tests/test_storage.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import shutil import sys diff --git a/tests/staticfiles_tests/test_templatetags.py b/tests/staticfiles_tests/test_templatetags.py index 541b233855..cd3f7d4bfa 100644 --- a/tests/staticfiles_tests/test_templatetags.py +++ b/tests/staticfiles_tests/test_templatetags.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.test import override_settings from .cases import StaticFilesTestCase diff --git a/tests/staticfiles_tests/test_views.py b/tests/staticfiles_tests/test_views.py index 6d9096784f..fa817a6ef1 100644 --- a/tests/staticfiles_tests/test_views.py +++ b/tests/staticfiles_tests/test_views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import posixpath from django.conf import settings diff --git a/tests/str/models.py b/tests/str/models.py index e606e912aa..33e31857fa 100644 --- a/tests/str/models.py +++ b/tests/str/models.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Adding __str__() or __unicode__() to models diff --git a/tests/str/tests.py b/tests/str/tests.py index 08fd554e5e..516560415c 100644 --- a/tests/str/tests.py +++ b/tests/str/tests.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import datetime from unittest import skipIf diff --git a/tests/string_lookup/models.py b/tests/string_lookup/models.py index 775ec2faf0..e8fd8a1b12 100644 --- a/tests/string_lookup/models.py +++ b/tests/string_lookup/models.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/string_lookup/tests.py b/tests/string_lookup/tests.py index 805833a8e4..22b0c6b9cf 100644 --- a/tests/string_lookup/tests.py +++ b/tests/string_lookup/tests.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.test import TestCase from .models import Article, Bar, Base, Child, Foo, Whiz diff --git a/tests/swappable_models/tests.py b/tests/swappable_models/tests.py index 548c7b3286..b67aece8c0 100644 --- a/tests/swappable_models/tests.py +++ b/tests/swappable_models/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from swappable_models.models import Article from django.contrib.auth.models import Permission diff --git a/tests/syndication_tests/feeds.py b/tests/syndication_tests/feeds.py index f4162b345e..87c8d962b7 100644 --- a/tests/syndication_tests/feeds.py +++ b/tests/syndication_tests/feeds.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.syndication import views from django.utils import feedgenerator from django.utils.timezone import get_fixed_timezone diff --git a/tests/syndication_tests/tests.py b/tests/syndication_tests/tests.py index 0fb860474c..c9baa6537b 100644 --- a/tests/syndication_tests/tests.py +++ b/tests/syndication_tests/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime from xml.dom import minidom diff --git a/tests/template_backends/test_dummy.py b/tests/template_backends/test_dummy.py index 83b42c7eb4..dededfe390 100644 --- a/tests/template_backends/test_dummy.py +++ b/tests/template_backends/test_dummy.py @@ -1,7 +1,3 @@ -# coding: utf-8 - -from __future__ import unicode_literals - import re from django.forms import CharField, Form, Media diff --git a/tests/template_backends/test_jinja2.py b/tests/template_backends/test_jinja2.py index a79c6bc460..117719fa0d 100644 --- a/tests/template_backends/test_jinja2.py +++ b/tests/template_backends/test_jinja2.py @@ -1,7 +1,3 @@ -# Since this package contains a "jinja2" directory, this is required to -# silence an ImportWarning warning on Python 2. -from __future__ import absolute_import - from unittest import skipIf from django.template import TemplateSyntaxError diff --git a/tests/template_tests/filter_tests/test_escapejs.py b/tests/template_tests/filter_tests/test_escapejs.py index ccb9cd3c0f..3b038726b2 100644 --- a/tests/template_tests/filter_tests/test_escapejs.py +++ b/tests/template_tests/filter_tests/test_escapejs.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.template.defaultfilters import escapejs_filter from django.test import SimpleTestCase from django.utils import six diff --git a/tests/template_tests/filter_tests/test_filesizeformat.py b/tests/template_tests/filter_tests/test_filesizeformat.py index 9d143ca100..2e425af8ac 100644 --- a/tests/template_tests/filter_tests/test_filesizeformat.py +++ b/tests/template_tests/filter_tests/test_filesizeformat.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.template.defaultfilters import filesizeformat from django.test import SimpleTestCase from django.utils import translation diff --git a/tests/template_tests/filter_tests/test_floatformat.py b/tests/template_tests/filter_tests/test_floatformat.py index b1ffbe56c1..d4a4526d1d 100644 --- a/tests/template_tests/filter_tests/test_floatformat.py +++ b/tests/template_tests/filter_tests/test_floatformat.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from decimal import Decimal, localcontext from django.template.defaultfilters import floatformat diff --git a/tests/template_tests/filter_tests/test_force_escape.py b/tests/template_tests/filter_tests/test_force_escape.py index 45f4efde62..776dc8042d 100644 --- a/tests/template_tests/filter_tests/test_force_escape.py +++ b/tests/template_tests/filter_tests/test_force_escape.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.template.defaultfilters import force_escape from django.test import SimpleTestCase from django.utils.safestring import SafeData diff --git a/tests/template_tests/filter_tests/test_iriencode.py b/tests/template_tests/filter_tests/test_iriencode.py index 837d6aa0f7..7d83b67f9d 100644 --- a/tests/template_tests/filter_tests/test_iriencode.py +++ b/tests/template_tests/filter_tests/test_iriencode.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.template.defaultfilters import iriencode, urlencode from django.test import SimpleTestCase from django.utils.safestring import mark_safe diff --git a/tests/template_tests/filter_tests/test_lower.py b/tests/template_tests/filter_tests/test_lower.py index 9746643875..1db934c5fa 100644 --- a/tests/template_tests/filter_tests/test_lower.py +++ b/tests/template_tests/filter_tests/test_lower.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.template.defaultfilters import lower from django.test import SimpleTestCase from django.utils.safestring import mark_safe diff --git a/tests/template_tests/filter_tests/test_slugify.py b/tests/template_tests/filter_tests/test_slugify.py index 5852417b2e..ec9f2bb736 100644 --- a/tests/template_tests/filter_tests/test_slugify.py +++ b/tests/template_tests/filter_tests/test_slugify.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.template.defaultfilters import slugify from django.test import SimpleTestCase from django.utils import six diff --git a/tests/template_tests/filter_tests/test_timesince.py b/tests/template_tests/filter_tests/test_timesince.py index 0cb975a90e..1936a1d44f 100644 --- a/tests/template_tests/filter_tests/test_timesince.py +++ b/tests/template_tests/filter_tests/test_timesince.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from datetime import datetime, timedelta from django.template.defaultfilters import timesince_filter diff --git a/tests/template_tests/filter_tests/test_timeuntil.py b/tests/template_tests/filter_tests/test_timeuntil.py index 1b06a21c93..011b0a2e92 100644 --- a/tests/template_tests/filter_tests/test_timeuntil.py +++ b/tests/template_tests/filter_tests/test_timeuntil.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from datetime import datetime, timedelta from django.template.defaultfilters import timeuntil_filter diff --git a/tests/template_tests/filter_tests/test_title.py b/tests/template_tests/filter_tests/test_title.py index cf4d1033c6..08a5fb0de4 100644 --- a/tests/template_tests/filter_tests/test_title.py +++ b/tests/template_tests/filter_tests/test_title.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.template.defaultfilters import title from django.test import SimpleTestCase diff --git a/tests/template_tests/filter_tests/test_truncatechars_html.py b/tests/template_tests/filter_tests/test_truncatechars_html.py index cf2623d740..e225a319f5 100644 --- a/tests/template_tests/filter_tests/test_truncatechars_html.py +++ b/tests/template_tests/filter_tests/test_truncatechars_html.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.template.defaultfilters import truncatechars_html from django.test import SimpleTestCase diff --git a/tests/template_tests/filter_tests/test_truncatewords_html.py b/tests/template_tests/filter_tests/test_truncatewords_html.py index aec2abf2d4..32ef413028 100644 --- a/tests/template_tests/filter_tests/test_truncatewords_html.py +++ b/tests/template_tests/filter_tests/test_truncatewords_html.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.template.defaultfilters import truncatewords_html from django.test import SimpleTestCase diff --git a/tests/template_tests/filter_tests/test_upper.py b/tests/template_tests/filter_tests/test_upper.py index f9c52bc0f8..a9efaf5322 100644 --- a/tests/template_tests/filter_tests/test_upper.py +++ b/tests/template_tests/filter_tests/test_upper.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.template.defaultfilters import upper from django.test import SimpleTestCase from django.utils.safestring import mark_safe diff --git a/tests/template_tests/filter_tests/test_urlencode.py b/tests/template_tests/filter_tests/test_urlencode.py index 82199f8f1c..d095bb8fae 100644 --- a/tests/template_tests/filter_tests/test_urlencode.py +++ b/tests/template_tests/filter_tests/test_urlencode.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.template.defaultfilters import urlencode from django.test import SimpleTestCase diff --git a/tests/template_tests/filter_tests/test_urlize.py b/tests/template_tests/filter_tests/test_urlize.py index 6822092943..3096213a22 100644 --- a/tests/template_tests/filter_tests/test_urlize.py +++ b/tests/template_tests/filter_tests/test_urlize.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.template.defaultfilters import urlize from django.test import SimpleTestCase from django.utils import six diff --git a/tests/template_tests/syntax_tests/i18n/base.py b/tests/template_tests/syntax_tests/i18n/base.py index b8c083d536..690e5d3933 100644 --- a/tests/template_tests/syntax_tests/i18n/base.py +++ b/tests/template_tests/syntax_tests/i18n/base.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os from django.conf import settings diff --git a/tests/template_tests/syntax_tests/i18n/test_blocktrans.py b/tests/template_tests/syntax_tests/i18n/test_blocktrans.py index 552c08b038..9af60e5131 100644 --- a/tests/template_tests/syntax_tests/i18n/test_blocktrans.py +++ b/tests/template_tests/syntax_tests/i18n/test_blocktrans.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import os from threading import local diff --git a/tests/template_tests/syntax_tests/i18n/test_filters.py b/tests/template_tests/syntax_tests/i18n/test_filters.py index 6a5a3fd1d5..cf8e4573c3 100644 --- a/tests/template_tests/syntax_tests/i18n/test_filters.py +++ b/tests/template_tests/syntax_tests/i18n/test_filters.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.test import SimpleTestCase from django.utils import translation diff --git a/tests/template_tests/syntax_tests/i18n/test_get_available_languages.py b/tests/template_tests/syntax_tests/i18n/test_get_available_languages.py index 187aa4e7ab..0be5a79528 100644 --- a/tests/template_tests/syntax_tests/i18n/test_get_available_languages.py +++ b/tests/template_tests/syntax_tests/i18n/test_get_available_languages.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.test import SimpleTestCase from ...utils import setup diff --git a/tests/template_tests/syntax_tests/i18n/test_get_language_info.py b/tests/template_tests/syntax_tests/i18n/test_get_language_info.py index f555f67b7a..bc89c65fdd 100644 --- a/tests/template_tests/syntax_tests/i18n/test_get_language_info.py +++ b/tests/template_tests/syntax_tests/i18n/test_get_language_info.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.test import SimpleTestCase from django.utils import translation diff --git a/tests/template_tests/syntax_tests/i18n/test_get_language_info_list.py b/tests/template_tests/syntax_tests/i18n/test_get_language_info_list.py index 4b782c94d6..4572f41f14 100644 --- a/tests/template_tests/syntax_tests/i18n/test_get_language_info_list.py +++ b/tests/template_tests/syntax_tests/i18n/test_get_language_info_list.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.test import SimpleTestCase from django.utils import translation diff --git a/tests/template_tests/syntax_tests/i18n/test_trans.py b/tests/template_tests/syntax_tests/i18n/test_trans.py index dd38608175..fec9f1728d 100644 --- a/tests/template_tests/syntax_tests/i18n/test_trans.py +++ b/tests/template_tests/syntax_tests/i18n/test_trans.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from threading import local from django.template import Context, Template, TemplateSyntaxError diff --git a/tests/template_tests/syntax_tests/i18n/test_underscore_syntax.py b/tests/template_tests/syntax_tests/i18n/test_underscore_syntax.py index aed204d63b..38d929e214 100644 --- a/tests/template_tests/syntax_tests/i18n/test_underscore_syntax.py +++ b/tests/template_tests/syntax_tests/i18n/test_underscore_syntax.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.template import Context, Template from django.test import SimpleTestCase from django.utils import translation diff --git a/tests/template_tests/syntax_tests/test_filter_syntax.py b/tests/template_tests/syntax_tests/test_filter_syntax.py index 3e524a61eb..c8d764659a 100644 --- a/tests/template_tests/syntax_tests/test_filter_syntax.py +++ b/tests/template_tests/syntax_tests/test_filter_syntax.py @@ -1,6 +1,3 @@ -# coding: utf-8 -from __future__ import unicode_literals - from django.template import TemplateSyntaxError from django.test import SimpleTestCase diff --git a/tests/template_tests/syntax_tests/test_url.py b/tests/template_tests/syntax_tests/test_url.py index e6e20d08f3..2103ba6159 100644 --- a/tests/template_tests/syntax_tests/test_url.py +++ b/tests/template_tests/syntax_tests/test_url.py @@ -1,4 +1,3 @@ -# coding: utf-8 from django.template import RequestContext, TemplateSyntaxError from django.test import RequestFactory, SimpleTestCase, override_settings from django.urls import NoReverseMatch, resolve diff --git a/tests/template_tests/test_callables.py b/tests/template_tests/test_callables.py index b7ce294403..4cfb49db5c 100644 --- a/tests/template_tests/test_callables.py +++ b/tests/template_tests/test_callables.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from unittest import TestCase from django.template import Context, Engine diff --git a/tests/template_tests/test_context.py b/tests/template_tests/test_context.py index 41e469eaab..5cd2ec2e82 100644 --- a/tests/template_tests/test_context.py +++ b/tests/template_tests/test_context.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from django.http import HttpRequest from django.template import ( Context, Engine, RequestContext, Template, Variable, VariableDoesNotExist, diff --git a/tests/template_tests/test_custom.py b/tests/template_tests/test_custom.py index b63882a9a8..df8ea17fb0 100644 --- a/tests/template_tests/test_custom.py +++ b/tests/template_tests/test_custom.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os from unittest import skipUnless diff --git a/tests/template_tests/test_loaders.py b/tests/template_tests/test_loaders.py index 5f50923524..6e9b6eb453 100644 --- a/tests/template_tests/test_loaders.py +++ b/tests/template_tests/test_loaders.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import os.path import sys import tempfile diff --git a/tests/template_tests/test_logging.py b/tests/template_tests/test_logging.py index a11af3c02d..9dd8046408 100644 --- a/tests/template_tests/test_logging.py +++ b/tests/template_tests/test_logging.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging from django.template import Context, Engine, Variable, VariableDoesNotExist diff --git a/tests/template_tests/test_parser.py b/tests/template_tests/test_parser.py index c6800f68dc..3b59424f47 100644 --- a/tests/template_tests/test_parser.py +++ b/tests/template_tests/test_parser.py @@ -1,8 +1,6 @@ """ Testing some internals of the template processing. These are *not* examples to be copied in user code. """ -from __future__ import unicode_literals - from django.template import Library, TemplateSyntaxError from django.template.base import ( TOKEN_BLOCK, FilterExpression, Parser, Token, Variable, diff --git a/tests/template_tests/test_response.py b/tests/template_tests/test_response.py index fa851a93f2..62cd14799d 100644 --- a/tests/template_tests/test_response.py +++ b/tests/template_tests/test_response.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import pickle import time from datetime import datetime diff --git a/tests/template_tests/test_unicode.py b/tests/template_tests/test_unicode.py index 169f15a6ed..f6471e72e0 100644 --- a/tests/template_tests/test_unicode.py +++ b/tests/template_tests/test_unicode.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from unittest import TestCase from django.template import Context, Engine diff --git a/tests/template_tests/tests.py b/tests/template_tests/tests.py index 50ddee6674..3ab215c094 100644 --- a/tests/template_tests/tests.py +++ b/tests/template_tests/tests.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import sys from django.contrib.auth.models import Group diff --git a/tests/template_tests/urls.py b/tests/template_tests/urls.py index b0304e1c54..a367696d43 100644 --- a/tests/template_tests/urls.py +++ b/tests/template_tests/urls.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.conf.urls import include, url from . import views diff --git a/tests/template_tests/utils.py b/tests/template_tests/utils.py index 1747f080bc..cbc452c808 100644 --- a/tests/template_tests/utils.py +++ b/tests/template_tests/utils.py @@ -1,7 +1,3 @@ -# coding: utf-8 - -from __future__ import unicode_literals - import functools import os diff --git a/tests/test_client/test_conditional_content_removal.py b/tests/test_client/test_conditional_content_removal.py index 644eb23a06..72bf7f238b 100644 --- a/tests/test_client/test_conditional_content_removal.py +++ b/tests/test_client/test_conditional_content_removal.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import gzip import io diff --git a/tests/test_client/tests.py b/tests/test_client/tests.py index 8b834e02e0..5981ca319e 100644 --- a/tests/test_client/tests.py +++ b/tests/test_client/tests.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Testing using the Test Client @@ -20,8 +19,6 @@ testing against the contexts and templates produced by a view, rather than the HTML rendered to the end-user. """ -from __future__ import unicode_literals - import tempfile from django.contrib.auth.models import User diff --git a/tests/test_client_regress/tests.py b/tests/test_client_regress/tests.py index 5598ed5280..0436ae9968 100644 --- a/tests/test_client_regress/tests.py +++ b/tests/test_client_regress/tests.py @@ -1,9 +1,6 @@ -# -*- coding: utf-8 -*- """ Regression tests for the Test Client, especially the customized assertions. """ -from __future__ import unicode_literals - import itertools import os diff --git a/tests/test_runner/tests.py b/tests/test_runner/tests.py index d6e9af71a1..670bc6683c 100644 --- a/tests/test_runner/tests.py +++ b/tests/test_runner/tests.py @@ -1,8 +1,6 @@ """ Tests for django test runner """ -from __future__ import unicode_literals - import unittest from admin_scripts.tests import AdminScriptTestCase diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py index 2a199ec5bc..e63c6774ae 100644 --- a/tests/test_utils/tests.py +++ b/tests/test_utils/tests.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import sys import unittest diff --git a/tests/timezones/tests.py b/tests/timezones/tests.py index 8f9bd23241..7f7c8228e8 100644 --- a/tests/timezones/tests.py +++ b/tests/timezones/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import re import sys diff --git a/tests/transactions/models.py b/tests/transactions/models.py index f4400363e5..4154b39123 100644 --- a/tests/transactions/models.py +++ b/tests/transactions/models.py @@ -6,8 +6,6 @@ each transaction upon a write, but you can decorate a function to get commit-on-success behavior. Alternatively, you can manage the transaction manually. """ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/transactions/tests.py b/tests/transactions/tests.py index 7dc21cca4f..12d2eb299d 100644 --- a/tests/transactions/tests.py +++ b/tests/transactions/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import signal import sys diff --git a/tests/unmanaged_models/tests.py b/tests/unmanaged_models/tests.py index e98cee8ae1..250aaaa435 100644 --- a/tests/unmanaged_models/tests.py +++ b/tests/unmanaged_models/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import connection from django.test import TestCase diff --git a/tests/update/tests.py b/tests/update/tests.py index ca1c5ac4f9..55a8e24c6a 100644 --- a/tests/update/tests.py +++ b/tests/update/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.exceptions import FieldError from django.db.models import Count, F, Max from django.test import TestCase diff --git a/tests/update_only_fields/tests.py b/tests/update_only_fields/tests.py index 7627bcd378..743b5fda8d 100644 --- a/tests/update_only_fields/tests.py +++ b/tests/update_only_fields/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db.models.signals import post_save, pre_save from django.test import TestCase diff --git a/tests/urlpatterns_reverse/test_localeregexprovider.py b/tests/urlpatterns_reverse/test_localeregexprovider.py index 401e9a1ad0..53dc744c77 100644 --- a/tests/urlpatterns_reverse/test_localeregexprovider.py +++ b/tests/urlpatterns_reverse/test_localeregexprovider.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os from django.core.exceptions import ImproperlyConfigured diff --git a/tests/urlpatterns_reverse/tests.py b/tests/urlpatterns_reverse/tests.py index 5f824469fa..a84e5bfb24 100644 --- a/tests/urlpatterns_reverse/tests.py +++ b/tests/urlpatterns_reverse/tests.py @@ -1,9 +1,6 @@ -# -*- coding: utf-8 -*- """ Unit tests for reverse URL lookups. """ -from __future__ import unicode_literals - import sys import threading import unittest diff --git a/tests/urlpatterns_reverse/utils.py b/tests/urlpatterns_reverse/utils.py index adcb310fa5..22664480d1 100644 --- a/tests/urlpatterns_reverse/utils.py +++ b/tests/urlpatterns_reverse/utils.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf.urls import url from . import views diff --git a/tests/utils_tests/test_crypto.py b/tests/utils_tests/test_crypto.py index d36f82e592..bd0c111ff3 100644 --- a/tests/utils_tests/test_crypto.py +++ b/tests/utils_tests/test_crypto.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import binascii import hashlib import unittest diff --git a/tests/utils_tests/test_dateformat.py b/tests/utils_tests/test_dateformat.py index bd99b31a42..c11dd5591d 100644 --- a/tests/utils_tests/test_dateformat.py +++ b/tests/utils_tests/test_dateformat.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from datetime import date, datetime from django.test import SimpleTestCase, override_settings diff --git a/tests/utils_tests/test_dateparse.py b/tests/utils_tests/test_dateparse.py index 0bb81ed0b0..0f48ff4ff9 100644 --- a/tests/utils_tests/test_dateparse.py +++ b/tests/utils_tests/test_dateparse.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import unittest from datetime import date, datetime, time, timedelta diff --git a/tests/utils_tests/test_encoding.py b/tests/utils_tests/test_encoding.py index 688b46194d..1d6976fc77 100644 --- a/tests/utils_tests/test_encoding.py +++ b/tests/utils_tests/test_encoding.py @@ -1,6 +1,3 @@ -# -*- encoding: utf-8 -*- -from __future__ import unicode_literals - import datetime import unittest diff --git a/tests/utils_tests/test_feedgenerator.py b/tests/utils_tests/test_feedgenerator.py index 9b249295c3..8c0edb4374 100644 --- a/tests/utils_tests/test_feedgenerator.py +++ b/tests/utils_tests/test_feedgenerator.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import unittest diff --git a/tests/utils_tests/test_functional.py b/tests/utils_tests/test_functional.py index 7a633620fc..f7b12724af 100644 --- a/tests/utils_tests/test_functional.py +++ b/tests/utils_tests/test_functional.py @@ -1,6 +1,3 @@ -# -*- encoding: utf-8 -*- -from __future__ import unicode_literals - import unittest from django.utils import six diff --git a/tests/utils_tests/test_glob.py b/tests/utils_tests/test_glob.py index 7e72815ef8..5cd7fbbe28 100644 --- a/tests/utils_tests/test_glob.py +++ b/tests/utils_tests/test_glob.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.test import SimpleTestCase from django.utils.glob import glob_escape diff --git a/tests/utils_tests/test_html.py b/tests/utils_tests/test_html.py index 39d590032f..ec818318b4 100644 --- a/tests/utils_tests/test_html.py +++ b/tests/utils_tests/test_html.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import os from datetime import datetime diff --git a/tests/utils_tests/test_http.py b/tests/utils_tests/test_http.py index e90d5e397d..30a8846021 100644 --- a/tests/utils_tests/test_http.py +++ b/tests/utils_tests/test_http.py @@ -1,6 +1,3 @@ -# -*- encoding: utf-8 -*- -from __future__ import unicode_literals - import sys import unittest from datetime import datetime diff --git a/tests/utils_tests/test_ipv6.py b/tests/utils_tests/test_ipv6.py index 84630d2ba0..4e434f3c3a 100644 --- a/tests/utils_tests/test_ipv6.py +++ b/tests/utils_tests/test_ipv6.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import unittest from django.utils.ipv6 import clean_ipv6_address, is_valid_ipv6_address diff --git a/tests/utils_tests/test_jslex.py b/tests/utils_tests/test_jslex.py index f77be16b7f..6b4269736a 100644 --- a/tests/utils_tests/test_jslex.py +++ b/tests/utils_tests/test_jslex.py @@ -1,7 +1,5 @@ -# -*- coding: utf-8 -*- """Tests for jslex.""" # originally from https://bitbucket.org/ned/jslex -from __future__ import unicode_literals from django.test import SimpleTestCase from django.utils.jslex import JsLexer, prepare_js_for_gettext diff --git a/tests/utils_tests/test_lazyobject.py b/tests/utils_tests/test_lazyobject.py index 9dc225b55f..588e85afc5 100644 --- a/tests/utils_tests/test_lazyobject.py +++ b/tests/utils_tests/test_lazyobject.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import copy import pickle import sys diff --git a/tests/utils_tests/test_lorem_ipsum.py b/tests/utils_tests/test_lorem_ipsum.py index 9b160cd2fb..b90190298a 100644 --- a/tests/utils_tests/test_lorem_ipsum.py +++ b/tests/utils_tests/test_lorem_ipsum.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import unittest from django.utils.lorem_ipsum import paragraphs, words diff --git a/tests/utils_tests/test_numberformat.py b/tests/utils_tests/test_numberformat.py index 3dd1b0644f..dd6057bb64 100644 --- a/tests/utils_tests/test_numberformat.py +++ b/tests/utils_tests/test_numberformat.py @@ -1,6 +1,3 @@ -# -*- encoding: utf-8 -*- -from __future__ import unicode_literals - from decimal import Decimal from sys import float_info from unittest import TestCase diff --git a/tests/utils_tests/test_regex_helper.py b/tests/utils_tests/test_regex_helper.py index f91fd1cec7..93383e1c1a 100644 --- a/tests/utils_tests/test_regex_helper.py +++ b/tests/utils_tests/test_regex_helper.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import unittest import warnings diff --git a/tests/utils_tests/test_safestring.py b/tests/utils_tests/test_safestring.py index abaf6a0596..96f42d5ddd 100644 --- a/tests/utils_tests/test_safestring.py +++ b/tests/utils_tests/test_safestring.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.template import Context, Template from django.test import SimpleTestCase from django.utils import html, six, text diff --git a/tests/utils_tests/test_simplelazyobject.py b/tests/utils_tests/test_simplelazyobject.py index bad47a2f89..8501b89e92 100644 --- a/tests/utils_tests/test_simplelazyobject.py +++ b/tests/utils_tests/test_simplelazyobject.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import pickle from django.contrib.auth.models import User diff --git a/tests/utils_tests/test_text.py b/tests/utils_tests/test_text.py index 3dfc33a120..9128fb0247 100644 --- a/tests/utils_tests/test_text.py +++ b/tests/utils_tests/test_text.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import json from django.test import SimpleTestCase diff --git a/tests/utils_tests/test_timesince.py b/tests/utils_tests/test_timesince.py index 645806a96b..3e2c5ce56e 100644 --- a/tests/utils_tests/test_timesince.py +++ b/tests/utils_tests/test_timesince.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import unittest diff --git a/tests/validation/models.py b/tests/validation/models.py index 2e2a144cb6..90b2dbb79a 100644 --- a/tests/validation/models.py +++ b/tests/validation/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from datetime import datetime from django.core.exceptions import ValidationError diff --git a/tests/validation/test_error_messages.py b/tests/validation/test_error_messages.py index c71b8cd60a..d2fc3e4939 100644 --- a/tests/validation/test_error_messages.py +++ b/tests/validation/test_error_messages.py @@ -1,6 +1,3 @@ -# -*- encoding: utf-8 -*- -from __future__ import unicode_literals - from unittest import TestCase from django.core.exceptions import ValidationError diff --git a/tests/validation/test_unique.py b/tests/validation/test_unique.py index 0780b9ec43..642154aaa7 100644 --- a/tests/validation/test_unique.py +++ b/tests/validation/test_unique.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import unittest diff --git a/tests/validation/test_validators.py b/tests/validation/test_validators.py index 4a3c99f08b..733ff5c139 100644 --- a/tests/validation/test_validators.py +++ b/tests/validation/test_validators.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from . import ValidationTestCase from .models import ModelToValidate diff --git a/tests/validation/tests.py b/tests/validation/tests.py index e7a49b470d..131ecda74d 100644 --- a/tests/validation/tests.py +++ b/tests/validation/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import forms from django.core.exceptions import NON_FIELD_ERRORS from django.test import TestCase diff --git a/tests/validators/tests.py b/tests/validators/tests.py index 4ef8a524b1..d5fb2215ca 100644 --- a/tests/validators/tests.py +++ b/tests/validators/tests.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import io import os import re diff --git a/tests/view_tests/__init__.py b/tests/view_tests/__init__.py index 638df1b91a..f48b197507 100644 --- a/tests/view_tests/__init__.py +++ b/tests/view_tests/__init__.py @@ -1,7 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - - class BrokenException(Exception): pass diff --git a/tests/view_tests/generic_urls.py b/tests/view_tests/generic_urls.py index 4ca2c8927a..2c40383a2d 100644 --- a/tests/view_tests/generic_urls.py +++ b/tests/view_tests/generic_urls.py @@ -1,6 +1,3 @@ -# -*- coding:utf-8 -*- -from __future__ import unicode_literals - from django.conf.urls import url from django.contrib.auth import views as auth_views from django.views.generic import RedirectView diff --git a/tests/view_tests/tests/test_debug.py b/tests/view_tests/tests/test_debug.py index 24fa593621..19ab456ba5 100644 --- a/tests/view_tests/tests/test_debug.py +++ b/tests/view_tests/tests/test_debug.py @@ -1,8 +1,3 @@ -# -*- coding: utf-8 -*- -# This coding header is significant for tests, as the debug view is parsing -# files to search for such a header to decode the source file content -from __future__ import unicode_literals - import importlib import inspect import os diff --git a/tests/view_tests/tests/test_defaults.py b/tests/view_tests/tests/test_defaults.py index 1b5ad25102..4b002f3632 100644 --- a/tests/view_tests/tests/test_defaults.py +++ b/tests/view_tests/tests/test_defaults.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime from django.contrib.sites.models import Site diff --git a/tests/view_tests/tests/test_i18n.py b/tests/view_tests/tests/test_i18n.py index 725d72890e..fc7be41594 100644 --- a/tests/view_tests/tests/test_i18n.py +++ b/tests/view_tests/tests/test_i18n.py @@ -1,6 +1,3 @@ -# -*- coding:utf-8 -*- -from __future__ import unicode_literals - import gettext import json from os import path diff --git a/tests/view_tests/tests/test_json.py b/tests/view_tests/tests/test_json.py index 0d6bc09120..34e8fa359b 100644 --- a/tests/view_tests/tests/test_json.py +++ b/tests/view_tests/tests/test_json.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import json from django.test import SimpleTestCase, override_settings diff --git a/tests/view_tests/tests/test_specials.py b/tests/view_tests/tests/test_specials.py index 8ef766e86f..70ffb1d23e 100644 --- a/tests/view_tests/tests/test_specials.py +++ b/tests/view_tests/tests/test_specials.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.test import SimpleTestCase, override_settings diff --git a/tests/view_tests/tests/test_static.py b/tests/view_tests/tests/test_static.py index 457577264e..f1a992789f 100644 --- a/tests/view_tests/tests/test_static.py +++ b/tests/view_tests/tests/test_static.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import mimetypes import unittest from os import path diff --git a/tests/view_tests/urls.py b/tests/view_tests/urls.py index 128be09eb6..c536ea78ed 100644 --- a/tests/view_tests/urls.py +++ b/tests/view_tests/urls.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from functools import partial from os import path diff --git a/tests/view_tests/views.py b/tests/view_tests/views.py index bfcdc20a13..5c63111405 100644 --- a/tests/view_tests/views.py +++ b/tests/view_tests/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import decimal import logging diff --git a/tests/wsgi/tests.py b/tests/wsgi/tests.py index e07f8d2478..68e8d4a86d 100644 --- a/tests/wsgi/tests.py +++ b/tests/wsgi/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.exceptions import ImproperlyConfigured from django.core.servers.basehttp import get_internal_wsgi_application from django.core.signals import request_started |