Refs #23919 -- Removed encoding preambles and future imports

23 files changed, 0 insertions, 47 deletions

diff --git a/django/utils/_os.py b/django/utils/_os.py
index a874214a58..994f766d49 100644
--- a/django/utils/_os.py
+++ b/django/utils/_os.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os
 import sys
 import tempfile
diff --git a/django/utils/cache.py b/django/utils/cache.py
index 0f6232b51b..fabdb363b9 100644
--- a/django/utils/cache.py
+++ b/django/utils/cache.py
@@ -16,8 +16,6 @@ cache keys to prevent delivery of wrong content.
 An example: i18n middleware would need to distinguish caches by the
 "Accept-language" header.
 """
-from __future__ import unicode_literals
-
 import hashlib
 import logging
 import re
diff --git a/django/utils/crypto.py b/django/utils/crypto.py
index 3804dd9111..a7257a1b3a 100644
--- a/django/utils/crypto.py
+++ b/django/utils/crypto.py
@@ -1,8 +1,6 @@
 """
 Django's standard crypto functions and utilities.
 """
-from __future__ import unicode_literals
-
 import binascii
 import hashlib
 import hmac
diff --git a/django/utils/dateformat.py b/django/utils/dateformat.py
index 70650bf625..861bf8f923 100644
--- a/django/utils/dateformat.py
+++ b/django/utils/dateformat.py
@@ -10,8 +10,6 @@ Usage:
 7th October 2003 11:39
 >>>
 """
-from __future__ import unicode_literals
-
 import calendar
 import datetime
 import re
diff --git a/django/utils/deprecation.py b/django/utils/deprecation.py
index 28405cf2c1..a37f2e3d69 100644
--- a/django/utils/deprecation.py
+++ b/django/utils/deprecation.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import inspect
 import warnings
 
diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 999ffae19a..a3b07dcec6 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -1,6 +1,3 @@
-# -*- encoding: utf-8 -*-
-from __future__ import unicode_literals
-
 import codecs
 import datetime
 import locale
diff --git a/django/utils/feedgenerator.py b/django/utils/feedgenerator.py
index d8a932b020..64aa970e93 100644
--- a/django/utils/feedgenerator.py
+++ b/django/utils/feedgenerator.py
@@ -21,8 +21,6 @@ Sample usage:
 For definitions of the different versions of RSS, see:
 http://web.archive.org/web/20110718035220/http://diveintomark.org/archives/2004/02/04/incompatible-rss
 """
-from __future__ import unicode_literals
-
 import datetime
 
 from django.utils import datetime_safe, six
diff --git a/django/utils/glob.py b/django/utils/glob.py
index d3f9e08138..92194d21eb 100644
--- a/django/utils/glob.py
+++ b/django/utils/glob.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os.path
 import re
 
diff --git a/django/utils/html.py b/django/utils/html.py
index ff9adffc75..384093a02f 100644
--- a/django/utils/html.py
+++ b/django/utils/html.py
@@ -1,7 +1,5 @@
 """HTML utilities suitable for global use."""
 
-from __future__ import unicode_literals
-
 import re
 
 from django.utils import six
diff --git a/django/utils/http.py b/django/utils/http.py
index cba2a08095..f4e77b86f9 100644
--- a/django/utils/http.py
+++ b/django/utils/http.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import base64
 import calendar
 import datetime
diff --git a/django/utils/inspect.py b/django/utils/inspect.py
index 597b2c095e..ffcbf30407 100644
--- a/django/utils/inspect.py
+++ b/django/utils/inspect.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import inspect
 
 from django.utils import six
diff --git a/django/utils/jslex.py b/django/utils/jslex.py
index bef6129188..0958ac030c 100644
--- a/django/utils/jslex.py
+++ b/django/utils/jslex.py
@@ -1,7 +1,5 @@
 """JsLex: a lexer for Javascript"""
 # Originally from https://bitbucket.org/ned/jslex
-from __future__ import unicode_literals
-
 import re
 
 
diff --git a/django/utils/log.py b/django/utils/log.py
index 2b57c6beff..77e2f59250 100644
--- a/django/utils/log.py
+++ b/django/utils/log.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import logging
 import logging.config  # needed when logging_config doesn't start with logging.config
 from copy import copy
diff --git a/django/utils/lorem_ipsum.py b/django/utils/lorem_ipsum.py
index 03426c152b..87988d2050 100644
--- a/django/utils/lorem_ipsum.py
+++ b/django/utils/lorem_ipsum.py
@@ -2,8 +2,6 @@
 Utility functions for generating "lorem ipsum" Latin text.
 """
 
-from __future__ import unicode_literals
-
 import random
 
 COMMON_P = (
diff --git a/django/utils/numberformat.py b/django/utils/numberformat.py
index ae5a3b5474..d4c9ad74a5 100644
--- a/django/utils/numberformat.py
+++ b/django/utils/numberformat.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from decimal import Decimal
 
 from django.conf import settings
diff --git a/django/utils/regex_helper.py b/django/utils/regex_helper.py
index d046b71d96..41f2459491 100644
--- a/django/utils/regex_helper.py
+++ b/django/utils/regex_helper.py
@@ -5,8 +5,6 @@ Used internally by Django and not intended for external use.
 This is not, and is not intended to be, a complete reg-exp decompiler. It
 should be good enough for a large class of URLS, however.
 """
-from __future__ import unicode_literals
-
 import warnings
 
 from django.utils import six
diff --git a/django/utils/six.py b/django/utils/six.py
index 52627592b7..b4038c72fa 100644
--- a/django/utils/six.py
+++ b/django/utils/six.py
@@ -20,8 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from __future__ import absolute_import
-
 import functools
 import itertools
 import operator
diff --git a/django/utils/text.py b/django/utils/text.py
index b0f139e034..dcedc524b0 100644
--- a/django/utils/text.py
+++ b/django/utils/text.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import re
 import unicodedata
 from gzip import GzipFile
diff --git a/django/utils/timesince.py b/django/utils/timesince.py
index b0eefaf734..f87d958f4f 100644
--- a/django/utils/timesince.py
+++ b/django/utils/timesince.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import calendar
 import datetime
 
diff --git a/django/utils/translation/__init__.py b/django/utils/translation/__init__.py
index 6cdcaf9bf1..fd02fa16a3 100644
--- a/django/utils/translation/__init__.py
+++ b/django/utils/translation/__init__.py
@@ -1,8 +1,6 @@
 """
 Internationalization support.
 """
-from __future__ import unicode_literals
-
 import re
 import warnings
 
diff --git a/django/utils/translation/template.py b/django/utils/translation/template.py
index b8618c4dd2..04dac65e90 100644
--- a/django/utils/translation/template.py
+++ b/django/utils/translation/template.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import re
 import warnings
 
diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py
index b3da22482a..9f016e8524 100644
--- a/django/utils/translation/trans_real.py
+++ b/django/utils/translation/trans_real.py
@@ -1,6 +1,4 @@
 """Translation helper functions."""
-from __future__ import unicode_literals
-
 import gettext as gettext_module
 import os
 import re
diff --git a/django/utils/version.py b/django/utils/version.py
index f5b0f109e6..dcf0c21866 100644
--- a/django/utils/version.py
+++ b/django/utils/version.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime
 import os
 import subprocess