Refs #23919 -- Removed encoding preambles and future imports

36 files changed, 0 insertions, 92 deletions

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