Refs #23919 -- Removed encoding preambles and future imports

django/db/backends/mysql/base.py

@@ -4,8 +4,6 @@ MySQL database backend for Django.
 Requires mysqlclient: https://pypi.python.org/pypi/mysqlclient/
 MySQLdb is supported for Python 2 only: http://sourceforge.net/projects/mysql-python
 """
-from __future__ import unicode_literals
-
 import re
 import sys
 

django/db/backends/mysql/operations.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import uuid
 
 from django.conf import settings

django/db/backends/oracle/base.py

@@ -3,8 +3,6 @@ Oracle database backend for Django.
 
 Requires cx_Oracle: http://cx-oracle.sourceforge.net/
 """
-from __future__ import unicode_literals
-
 import datetime
 import decimal
 import os

django/db/backends/oracle/operations.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime
 import re
 import uuid

django/db/backends/postgresql/introspection.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import warnings
 
 from django.db.backends.base.introspection import (

django/db/backends/postgresql/operations.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from psycopg2.extras import Inet
 
 from django.conf import settings

django/db/backends/sqlite3/base.py

@@ -4,8 +4,6 @@ SQLite3 backend for django.
 Works with either the pysqlite2 module or the sqlite3 module in the
 standard library.
 """
-from __future__ import unicode_literals
-
 import decimal
 import re
 import warnings

django/db/backends/sqlite3/features.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db import utils
 from django.db.backends.base.features import BaseDatabaseFeatures
 from django.utils import six

django/db/backends/sqlite3/operations.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime
 import uuid
 

django/db/backends/utils.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import datetime
 import decimal
 import hashlib

django/db/migrations/autodetector.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import functools
 import re
 from itertools import chain

django/db/migrations/exceptions.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db.utils import DatabaseError
 from django.utils.encoding import python_2_unicode_compatible
 

django/db/migrations/executor.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.apps.registry import apps as global_apps
 from django.db import migrations, router
 

django/db/migrations/graph.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import sys
 import warnings
 from collections import deque

django/db/migrations/loader.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os
 import sys
 from importlib import import_module

django/db/migrations/migration.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db.transaction import atomic
 from django.utils.encoding import python_2_unicode_compatible
 

django/db/migrations/operations/base.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db import router
 
 

django/db/migrations/operations/fields.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db.models.fields import NOT_PROVIDED
 from django.utils.functional import cached_property
 

django/db/migrations/operations/models.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db import models
 from django.db.migrations.operations.base import Operation
 from django.db.migrations.state import ModelState

django/db/migrations/operations/special.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db import router
 
 from .base import Operation

django/db/migrations/optimizer.py

@@ -1,6 +1,3 @@
-from __future__ import unicode_literals
-
-
 class MigrationOptimizer(object):
     """
     Powers the optimization process, where you provide a list of Operations

django/db/migrations/questioner.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, unicode_literals
-
 import importlib
 import os
 import sys

django/db/migrations/recorder.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.apps.registry import Apps
 from django.db import models
 from django.db.utils import DatabaseError

django/db/migrations/serializer.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import collections
 import datetime
 import decimal

django/db/migrations/state.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import copy
 from collections import OrderedDict
 from contextlib import contextmanager

django/db/migrations/writer.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os
 import re
 from importlib import import_module
@@ -294,9 +292,7 @@ class MigrationWriter(object):
 
 
 MIGRATION_TEMPLATE = """\
-# -*- coding: utf-8 -*-
 # Generated by Django %(version)s on %(timestamp)s
-from __future__ import unicode_literals
 
 %(imports)s
 

django/db/models/base.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import copy
 import inspect
 import warnings

django/db/models/fields/__init__.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import collections
 import copy
 import datetime

django/db/models/fields/related.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import inspect
 from functools import partial
 

django/db/models/fields/related_descriptors.py

@@ -63,8 +63,6 @@ and two directions (forward and reverse) for a total of six combinations.
    ``ReverseManyToManyDescriptor``, use ``ManyToManyDescriptor`` instead.
 """
 
-from __future__ import unicode_literals
-
 from operator import attrgetter
 
 from django.db import connections, router, transaction

django/db/models/fields/reverse_related.py

@@ -9,8 +9,6 @@ They also act as reverse fields for the purposes of the Meta API because
 they're the closest concept currently available.
 """
 
-from __future__ import unicode_literals
-
 from django.core import exceptions
 from django.utils.encoding import force_text
 from django.utils.functional import cached_property

django/db/models/functions/datetime.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from datetime import datetime
 
 from django.conf import settings

django/db/models/indexes.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import hashlib
 
 from django.utils.encoding import force_bytes

django/db/models/options.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import copy
 import warnings
 from bisect import bisect

django/db/models/query_utils.py

@@ -5,8 +5,6 @@ Factored out from django.db.models.query to avoid making the main module very
 large and/or so that they can be used by other modules without getting into
 circular import difficulties.
 """
-from __future__ import unicode_literals
-
 import inspect
 from collections import namedtuple