From d7b9aaa366dd54ecc3142c588162e3adc7c2f7ac Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Sat, 19 Nov 2016 18:19:41 +0100 Subject: [PATCH] Refs #23919 -- Removed encoding preambles and future imports --- django/__init__.py | 2 -- django/conf/app_template/admin.py-tpl | 2 +- django/conf/app_template/apps.py-tpl | 2 +- django/conf/app_template/models.py-tpl | 2 +- django/conf/app_template/tests.py-tpl | 2 +- django/conf/app_template/views.py-tpl | 2 +- django/conf/global_settings.py | 2 -- django/conf/locale/__init__.py | 3 --- django/conf/locale/ar/formats.py | 3 --- django/conf/locale/az/formats.py | 3 --- django/conf/locale/bg/formats.py | 3 --- django/conf/locale/bn/formats.py | 3 --- django/conf/locale/bs/formats.py | 3 --- django/conf/locale/ca/formats.py | 3 --- django/conf/locale/cs/formats.py | 3 --- django/conf/locale/cy/formats.py | 3 --- django/conf/locale/da/formats.py | 3 --- django/conf/locale/de/formats.py | 3 --- django/conf/locale/de_CH/formats.py | 4 --- django/conf/locale/el/formats.py | 3 --- django/conf/locale/en/formats.py | 3 --- django/conf/locale/en_AU/formats.py | 3 --- django/conf/locale/en_GB/formats.py | 3 --- django/conf/locale/eo/formats.py | 3 --- django/conf/locale/es/formats.py | 3 --- django/conf/locale/es_AR/formats.py | 3 --- django/conf/locale/es_CO/formats.py | 3 --- django/conf/locale/es_MX/formats.py | 3 --- django/conf/locale/es_NI/formats.py | 3 --- django/conf/locale/es_PR/formats.py | 3 --- django/conf/locale/et/formats.py | 3 --- django/conf/locale/eu/formats.py | 3 --- django/conf/locale/fa/formats.py | 3 --- django/conf/locale/fi/formats.py | 3 --- django/conf/locale/fr/formats.py | 3 --- django/conf/locale/fy/formats.py | 3 --- django/conf/locale/ga/formats.py | 3 --- django/conf/locale/gd/formats.py | 3 --- django/conf/locale/gl/formats.py | 3 --- django/conf/locale/he/formats.py | 3 --- django/conf/locale/hi/formats.py | 3 --- django/conf/locale/hr/formats.py | 3 --- django/conf/locale/hu/formats.py | 3 --- django/conf/locale/id/formats.py | 3 --- django/conf/locale/is/formats.py | 3 --- django/conf/locale/it/formats.py | 3 --- django/conf/locale/ja/formats.py | 3 --- django/conf/locale/ka/formats.py | 3 --- django/conf/locale/km/formats.py | 3 --- django/conf/locale/kn/formats.py | 3 --- django/conf/locale/ko/formats.py | 3 --- django/conf/locale/lt/formats.py | 3 --- django/conf/locale/lv/formats.py | 3 --- django/conf/locale/mk/formats.py | 3 --- django/conf/locale/ml/formats.py | 3 --- django/conf/locale/mn/formats.py | 3 --- django/conf/locale/nb/formats.py | 3 --- django/conf/locale/nl/formats.py | 3 --- django/conf/locale/nn/formats.py | 3 --- django/conf/locale/pl/formats.py | 3 --- django/conf/locale/pt/formats.py | 3 --- django/conf/locale/pt_BR/formats.py | 3 --- django/conf/locale/ro/formats.py | 3 --- django/conf/locale/ru/formats.py | 3 --- django/conf/locale/sk/formats.py | 3 --- django/conf/locale/sl/formats.py | 3 --- django/conf/locale/sq/formats.py | 3 --- django/conf/locale/sr/formats.py | 3 --- django/conf/locale/sr_Latn/formats.py | 3 --- django/conf/locale/sv/formats.py | 3 --- django/conf/locale/ta/formats.py | 3 --- django/conf/locale/te/formats.py | 3 --- django/conf/locale/th/formats.py | 3 --- django/conf/locale/tr/formats.py | 3 --- django/conf/locale/uk/formats.py | 4 --- django/conf/locale/vi/formats.py | 3 --- django/conf/locale/zh_Hans/formats.py | 3 --- django/conf/locale/zh_Hant/formats.py | 3 --- django/contrib/admin/checks.py | 3 --- django/contrib/admin/forms.py | 2 -- django/contrib/admin/helpers.py | 2 -- .../contrib/admin/migrations/0001_initial.py | 3 --- .../0002_logentry_remove_auto_add.py | 3 --- django/contrib/admin/models.py | 2 -- django/contrib/admin/options.py | 2 -- .../contrib/admin/templatetags/admin_list.py | 2 -- django/contrib/admin/utils.py | 2 -- django/contrib/admin/widgets.py | 2 -- django/contrib/auth/backends.py | 2 -- django/contrib/auth/base_user.py | 2 -- django/contrib/auth/checks.py | 3 --- django/contrib/auth/forms.py | 2 -- django/contrib/auth/hashers.py | 2 -- django/contrib/auth/management/__init__.py | 2 -- .../management/commands/changepassword.py | 2 -- .../management/commands/createsuperuser.py | 2 -- .../contrib/auth/migrations/0001_initial.py | 3 --- .../0002_alter_permission_name_max_length.py | 3 --- .../0003_alter_user_email_max_length.py | 3 --- .../0004_alter_user_username_opts.py | 3 --- .../0005_alter_user_last_login_null.py | 3 --- .../0006_require_contenttypes_0002.py | 3 --- ...007_alter_validators_add_error_messages.py | 3 --- .../0008_alter_user_username_max_length.py | 3 --- django/contrib/auth/models.py | 2 -- django/contrib/auth/password_validation.py | 2 -- django/contrib/contenttypes/admin.py | 2 -- django/contrib/contenttypes/checks.py | 3 --- django/contrib/contenttypes/fields.py | 2 -- django/contrib/contenttypes/forms.py | 2 -- .../contenttypes/migrations/0001_initial.py | 3 --- .../0002_remove_content_type_name.py | 3 --- django/contrib/contenttypes/models.py | 2 -- django/contrib/contenttypes/views.py | 2 -- .../flatpages/migrations/0001_initial.py | 3 --- django/contrib/flatpages/models.py | 2 -- .../gis/db/backends/postgis/adapter.py | 2 -- django/contrib/gis/db/models/lookups.py | 2 -- .../contrib/gis/db/models/sql/conversion.py | 2 -- django/contrib/gis/feeds.py | 2 -- django/contrib/gis/forms/fields.py | 2 -- django/contrib/gis/forms/widgets.py | 2 -- django/contrib/gis/gdal/libgdal.py | 2 -- django/contrib/gis/geos/geometry.py | 2 -- django/contrib/gis/serializers/geojson.py | 2 -- django/contrib/gis/sitemaps/views.py | 2 -- django/contrib/gis/views.py | 2 -- .../contrib/humanize/templatetags/humanize.py | 3 --- django/contrib/messages/storage/base.py | 2 -- django/contrib/postgres/indexes.py | 2 -- django/contrib/postgres/utils.py | 2 -- django/contrib/redirects/middleware.py | 2 -- .../redirects/migrations/0001_initial.py | 3 --- django/contrib/sessions/backends/base.py | 2 -- django/contrib/sessions/base_session.py | 2 -- .../sessions/migrations/0001_initial.py | 3 --- django/contrib/sessions/models.py | 2 -- django/contrib/sites/managers.py | 3 --- .../contrib/sites/migrations/0001_initial.py | 3 --- .../migrations/0002_alter_domain_unique.py | 3 --- django/contrib/sites/models.py | 2 -- django/contrib/sites/requests.py | 2 -- django/contrib/sites/shortcuts.py | 2 -- .../management/commands/collectstatic.py | 2 -- .../management/commands/findstatic.py | 2 -- django/contrib/staticfiles/storage.py | 2 -- django/contrib/syndication/views.py | 2 -- django/core/cache/backends/base.py | 2 -- django/core/cache/utils.py | 2 -- django/core/checks/__init__.py | 3 --- django/core/checks/caches.py | 2 -- django/core/checks/messages.py | 3 --- django/core/checks/model_checks.py | 3 --- django/core/checks/registry.py | 3 --- django/core/checks/templates.py | 3 --- django/core/checks/urls.py | 2 -- django/core/files/base.py | 2 -- django/core/files/uploadhandler.py | 2 -- django/core/handlers/base.py | 2 -- django/core/handlers/exception.py | 2 -- django/core/handlers/wsgi.py | 2 -- django/core/mail/__init__.py | 2 -- django/core/mail/message.py | 2 -- django/core/management/__init__.py | 2 -- django/core/management/base.py | 3 --- django/core/management/commands/check.py | 3 --- .../management/commands/compilemessages.py | 2 -- django/core/management/commands/flush.py | 2 -- django/core/management/commands/inspectdb.py | 4 --- django/core/management/commands/loaddata.py | 2 -- .../core/management/commands/makemessages.py | 2 -- django/core/management/commands/migrate.py | 3 --- django/core/management/commands/runserver.py | 2 -- .../management/commands/showmigrations.py | 3 --- django/core/management/commands/sqlflush.py | 2 -- django/core/management/commands/sqlmigrate.py | 3 --- .../management/commands/sqlsequencereset.py | 2 -- django/core/management/sql.py | 2 -- django/core/management/templates.py | 2 -- django/core/management/utils.py | 2 -- django/core/serializers/json.py | 3 --- django/core/serializers/python.py | 2 -- django/core/serializers/xml_serializer.py | 2 -- django/core/servers/basehttp.py | 2 -- django/core/signing.py | 2 -- django/core/validators.py | 2 -- django/db/backends/mysql/base.py | 2 -- django/db/backends/mysql/operations.py | 2 -- django/db/backends/oracle/base.py | 2 -- django/db/backends/oracle/operations.py | 2 -- .../db/backends/postgresql/introspection.py | 2 -- django/db/backends/postgresql/operations.py | 2 -- django/db/backends/sqlite3/base.py | 2 -- django/db/backends/sqlite3/features.py | 2 -- django/db/backends/sqlite3/operations.py | 2 -- django/db/backends/utils.py | 2 -- django/db/migrations/autodetector.py | 2 -- django/db/migrations/exceptions.py | 2 -- django/db/migrations/executor.py | 2 -- django/db/migrations/graph.py | 2 -- django/db/migrations/loader.py | 2 -- django/db/migrations/migration.py | 2 -- django/db/migrations/operations/base.py | 2 -- django/db/migrations/operations/fields.py | 2 -- django/db/migrations/operations/models.py | 2 -- django/db/migrations/operations/special.py | 2 -- django/db/migrations/optimizer.py | 3 --- django/db/migrations/questioner.py | 2 -- django/db/migrations/recorder.py | 2 -- django/db/migrations/serializer.py | 2 -- django/db/migrations/state.py | 2 -- django/db/migrations/writer.py | 4 --- django/db/models/base.py | 2 -- django/db/models/fields/__init__.py | 3 --- django/db/models/fields/related.py | 2 -- .../db/models/fields/related_descriptors.py | 2 -- django/db/models/fields/reverse_related.py | 2 -- django/db/models/functions/datetime.py | 2 -- django/db/models/indexes.py | 2 -- django/db/models/options.py | 2 -- django/db/models/query_utils.py | 2 -- django/forms/boundfield.py | 2 -- django/forms/fields.py | 2 -- django/forms/forms.py | 2 -- django/forms/formsets.py | 2 -- django/forms/models.py | 2 -- django/forms/utils.py | 2 -- django/forms/widgets.py | 2 -- django/http/cookie.py | 2 -- django/http/multipartparser.py | 2 -- django/http/request.py | 2 -- django/http/response.py | 2 -- django/middleware/csrf.py | 2 -- django/template/backends/base.py | 3 --- django/template/backends/django.py | 3 --- django/template/backends/dummy.py | 3 --- django/template/backends/jinja2.py | 3 --- django/template/backends/utils.py | 3 --- django/template/base.py | 2 -- django/template/context_processors.py | 2 -- django/template/defaultfilters.py | 2 -- django/template/defaulttags.py | 2 -- django/templatetags/cache.py | 2 -- django/templatetags/i18n.py | 2 -- django/test/client.py | 2 -- django/test/html.py | 2 -- django/test/selenium.py | 2 -- django/test/testcases.py | 2 -- django/urls/base.py | 2 -- django/urls/exceptions.py | 2 -- django/urls/resolvers.py | 2 -- django/urls/utils.py | 2 -- django/utils/_os.py | 2 -- django/utils/cache.py | 2 -- django/utils/crypto.py | 2 -- django/utils/dateformat.py | 2 -- django/utils/deprecation.py | 2 -- django/utils/encoding.py | 3 --- django/utils/feedgenerator.py | 2 -- django/utils/glob.py | 2 -- django/utils/html.py | 2 -- django/utils/http.py | 2 -- django/utils/inspect.py | 2 -- django/utils/jslex.py | 2 -- django/utils/log.py | 2 -- django/utils/lorem_ipsum.py | 2 -- django/utils/numberformat.py | 2 -- django/utils/regex_helper.py | 2 -- django/utils/six.py | 2 -- django/utils/text.py | 2 -- django/utils/timesince.py | 2 -- django/utils/translation/__init__.py | 2 -- django/utils/translation/template.py | 2 -- django/utils/translation/trans_real.py | 2 -- django/utils/version.py | 2 -- django/views/debug.py | 2 -- django/views/generic/base.py | 2 -- django/views/generic/dates.py | 2 -- django/views/generic/detail.py | 2 -- django/views/generic/list.py | 2 -- django/views/static.py | 2 -- docs/conf.py | 4 --- docs/howto/writing-migrations.txt | 6 ----- docs/ref/files/file.txt | 1 - docs/ref/migration-operations.txt | 3 --- docs/topics/i18n/formatting.txt | 2 -- docs/topics/migrations.txt | 26 ------------------- docs/topics/templates.txt | 2 -- tests/admin_changelist/tests.py | 2 -- tests/admin_checks/tests.py | 2 -- tests/admin_custom_urls/tests.py | 2 -- tests/admin_docs/test_middleware.py | 2 -- tests/admin_docs/test_utils.py | 2 -- tests/admin_docs/test_views.py | 2 -- tests/admin_docs/tests.py | 2 -- tests/admin_filters/models.py | 2 -- tests/admin_filters/tests.py | 2 -- tests/admin_inlines/models.py | 3 --- tests/admin_inlines/test_templates.py | 2 -- tests/admin_inlines/tests.py | 2 -- tests/admin_ordering/models.py | 1 - tests/admin_ordering/tests.py | 2 -- tests/admin_registration/tests.py | 2 -- .../migrations/0001_initial.py | 2 -- .../another_app_waiting_migration/models.py | 2 -- .../app_raising_messages/models.py | 3 --- .../app_raising_warning/models.py | 3 --- .../migrations/0001_initial.py | 2 -- .../app_waiting_migration/models.py | 2 -- tests/admin_scripts/tests.py | 22 +--------------- tests/admin_utils/test_logentry.py | 3 --- tests/admin_utils/tests.py | 2 -- tests/admin_views/admin.py | 3 --- .../custom_has_permission_admin.py | 2 -- tests/admin_views/customadmin.py | 2 -- tests/admin_views/models.py | 3 --- tests/admin_views/test_adminsite.py | 2 -- tests/admin_views/test_templatetags.py | 2 -- tests/admin_views/tests.py | 3 --- tests/admin_widgets/models.py | 2 -- tests/admin_widgets/tests.py | 3 --- tests/aggregation/models.py | 1 - tests/aggregation/tests.py | 2 -- tests/aggregation_regress/models.py | 1 - tests/aggregation_regress/tests.py | 2 -- tests/annotations/models.py | 1 - tests/annotations/tests.py | 2 -- tests/app_loading/tests.py | 2 -- tests/apps/apps.py | 2 -- tests/apps/models.py | 2 -- tests/apps/tests.py | 2 -- tests/auth_tests/test_auth_backends.py | 2 -- tests/auth_tests/test_basic.py | 3 --- tests/auth_tests/test_checks.py | 2 -- tests/auth_tests/test_deprecated_views.py | 3 --- tests/auth_tests/test_forms.py | 3 --- tests/auth_tests/test_handlers.py | 2 -- tests/auth_tests/test_hashers.py | 3 --- tests/auth_tests/test_management.py | 2 -- tests/auth_tests/test_models.py | 3 --- tests/auth_tests/test_validators.py | 3 --- tests/auth_tests/test_views.py | 3 --- tests/backends/models.py | 2 -- tests/backends/test_mysql.py | 2 -- tests/backends/tests.py | 3 --- tests/base/models.py | 2 -- tests/basic/models.py | 1 - tests/basic/tests.py | 2 -- tests/builtin_server/tests.py | 2 -- tests/bulk_create/tests.py | 2 -- tests/cache/tests.py | 4 --- tests/check_framework/models.py | 3 --- tests/check_framework/tests.py | 3 --- tests/conditional_processing/tests.py | 3 --- tests/contenttypes_tests/models.py | 2 -- .../operations_migrations/0001_initial.py | 3 --- .../operations_migrations/0002_rename_foo.py | 3 --- tests/contenttypes_tests/test_models.py | 2 -- tests/contenttypes_tests/tests.py | 3 --- tests/contenttypes_tests/urls.py | 2 -- tests/csrf_tests/tests.py | 3 --- tests/csrf_tests/views.py | 2 -- tests/custom_columns/models.py | 2 -- tests/custom_columns/tests.py | 2 -- tests/custom_lookups/tests.py | 2 -- tests/custom_managers/models.py | 2 -- tests/custom_managers/tests.py | 2 -- tests/custom_methods/tests.py | 2 -- tests/custom_pk/models.py | 3 --- tests/custom_pk/tests.py | 3 --- tests/datatypes/tests.py | 2 -- tests/dates/models.py | 2 -- tests/dates/tests.py | 2 -- tests/datetimes/models.py | 2 -- tests/datetimes/tests.py | 2 -- tests/db_functions/models.py | 2 -- tests/db_functions/test_datetime.py | 2 -- tests/db_functions/tests.py | 2 -- tests/dbshell/test_postgresql_psycopg2.py | 3 --- tests/defer/tests.py | 2 -- tests/defer_regress/tests.py | 2 -- tests/delete/models.py | 2 -- tests/delete/tests.py | 2 -- tests/delete_regress/tests.py | 2 -- tests/deprecation/tests.py | 2 -- tests/distinct_on_fields/models.py | 2 -- tests/distinct_on_fields/tests.py | 2 -- tests/expressions/models.py | 2 -- tests/expressions/test_queryset_values.py | 2 -- tests/expressions/tests.py | 2 -- tests/expressions_case/models.py | 2 -- tests/expressions_case/tests.py | 2 -- tests/extra_regress/models.py | 2 -- tests/extra_regress/tests.py | 2 -- tests/field_deconstruction/tests.py | 2 -- tests/field_defaults/models.py | 1 - tests/field_subclassing/fields.py | 2 -- tests/field_subclassing/tests.py | 2 -- tests/file_storage/tests.py | 3 --- tests/file_uploads/tests.py | 3 --- tests/file_uploads/views.py | 2 -- tests/files/tests.py | 3 --- tests/fixtures/tests.py | 2 -- tests/fixtures_model_package/tests.py | 2 -- tests/fixtures_regress/models.py | 2 -- tests/fixtures_regress/tests.py | 3 --- tests/flatpages_tests/test_forms.py | 2 -- tests/flatpages_tests/test_models.py | 4 --- tests/flatpages_tests/test_sitemaps.py | 2 -- tests/force_insert_update/tests.py | 2 -- .../field_tests/test_booleanfield.py | 2 -- .../forms_tests/field_tests/test_charfield.py | 2 -- .../field_tests/test_choicefield.py | 3 --- .../field_tests/test_combofield.py | 2 -- .../forms_tests/field_tests/test_datefield.py | 1 - .../field_tests/test_datetimefield.py | 2 -- .../field_tests/test_decimalfield.py | 3 --- .../field_tests/test_durationfield.py | 2 -- .../field_tests/test_emailfield.py | 3 --- .../forms_tests/field_tests/test_filefield.py | 3 --- .../field_tests/test_filepathfield.py | 2 -- .../field_tests/test_floatfield.py | 2 -- .../field_tests/test_genericipaddressfield.py | 2 -- .../field_tests/test_imagefield.py | 2 -- .../field_tests/test_integerfield.py | 3 --- .../field_tests/test_multiplechoicefield.py | 2 -- .../field_tests/test_nullbooleanfield.py | 2 -- .../field_tests/test_regexfield.py | 3 --- .../forms_tests/field_tests/test_slugfield.py | 3 --- .../field_tests/test_splitdatetimefield.py | 2 -- .../forms_tests/field_tests/test_timefield.py | 2 -- .../field_tests/test_typedchoicefield.py | 2 -- .../test_typedmultiplechoicefield.py | 2 -- .../forms_tests/field_tests/test_urlfield.py | 3 --- .../forms_tests/field_tests/test_uuidfield.py | 2 -- tests/forms_tests/models.py | 3 --- .../forms_tests/tests/test_error_messages.py | 3 --- tests/forms_tests/tests/test_forms.py | 3 --- tests/forms_tests/tests/test_formsets.py | 3 --- tests/forms_tests/tests/test_i18n.py | 2 -- tests/forms_tests/tests/test_media.py | 1 - tests/forms_tests/tests/test_utils.py | 3 --- tests/forms_tests/tests/test_validators.py | 2 -- tests/forms_tests/tests/test_widgets.py | 2 -- tests/forms_tests/tests/tests.py | 3 --- tests/forms_tests/widget_tests/test_select.py | 3 --- .../widget_tests/test_textinput.py | 3 --- tests/forms_tests/widget_tests/test_widget.py | 2 -- tests/generic_inline_admin/tests.py | 3 --- tests/generic_relations/models.py | 2 -- tests/generic_relations/tests.py | 2 -- tests/generic_views/forms.py | 2 -- tests/generic_views/test_base.py | 2 -- tests/generic_views/test_dates.py | 3 --- tests/generic_views/test_detail.py | 3 --- tests/generic_views/test_edit.py | 2 -- tests/generic_views/test_list.py | 3 --- tests/generic_views/urls.py | 3 --- tests/generic_views/views.py | 2 -- tests/get_earliest_or_latest/tests.py | 2 -- tests/get_object_or_404/tests.py | 2 -- tests/get_or_create/models.py | 2 -- tests/get_or_create/tests.py | 2 -- tests/gis_tests/distapp/tests.py | 2 -- tests/gis_tests/gdal_tests/test_srs.py | 3 --- tests/gis_tests/geo3d/tests.py | 2 -- tests/gis_tests/geoadmin/tests.py | 2 -- tests/gis_tests/geoapp/feeds.py | 2 -- tests/gis_tests/geoapp/test_feeds.py | 2 -- tests/gis_tests/geoapp/test_functions.py | 2 -- tests/gis_tests/geoapp/test_regress.py | 3 --- tests/gis_tests/geoapp/test_serializers.py | 2 -- tests/gis_tests/geoapp/test_sitemaps.py | 2 -- tests/gis_tests/geoapp/tests.py | 2 -- tests/gis_tests/geoapp/urls.py | 2 -- tests/gis_tests/geogapp/tests.py | 2 -- tests/gis_tests/geos_tests/test_geos.py | 2 -- tests/gis_tests/geos_tests/test_io.py | 2 -- .../gis_tests/gis_migrations/test_commands.py | 2 -- .../gis_migrations/test_operations.py | 2 -- tests/gis_tests/inspectapp/tests.py | 2 -- tests/gis_tests/layermap/tests.py | 3 --- tests/gis_tests/relatedapp/tests.py | 2 -- tests/gis_tests/test_geoip2.py | 3 --- tests/handlers/tests.py | 4 --- tests/handlers/urls.py | 2 -- tests/handlers/views.py | 2 -- tests/httpwrappers/tests.py | 3 --- tests/humanize_tests/tests.py | 2 -- tests/i18n/contenttypes/tests.py | 3 --- tests/i18n/patterns/tests.py | 2 -- tests/i18n/test_compilation.py | 3 --- tests/i18n/test_extraction.py | 3 --- tests/i18n/test_percents.py | 3 --- tests/i18n/tests.py | 3 --- tests/i18n/urls.py | 2 -- tests/inline_formsets/models.py | 1 - tests/inline_formsets/tests.py | 2 -- tests/inspectdb/models.py | 3 --- tests/inspectdb/tests.py | 3 --- tests/introspection/models.py | 2 -- tests/introspection/tests.py | 2 -- .../test_backend_specific.py | 3 --- tests/invalid_models_tests/test_models.py | 3 --- .../test_ordinary_fields.py | 3 --- .../test_relative_fields.py | 3 --- tests/known_related_objects/tests.py | 2 -- tests/logging_tests/tests.py | 3 --- tests/logging_tests/urls.py | 2 -- tests/logging_tests/urls_i18n.py | 2 -- tests/logging_tests/views.py | 2 -- tests/lookup/models.py | 2 -- tests/lookup/test_timefield.py | 2 -- tests/lookup/tests.py | 2 -- tests/m2m_and_m2o/models.py | 2 -- tests/m2m_intermediary/models.py | 2 -- tests/m2m_intermediary/tests.py | 2 -- tests/m2m_multiple/tests.py | 2 -- tests/m2m_recursive/tests.py | 2 -- tests/m2m_regress/tests.py | 2 -- tests/m2m_through/tests.py | 2 -- tests/m2m_through_regress/models.py | 2 -- tests/m2m_through_regress/test_multitable.py | 2 -- tests/m2m_through_regress/tests.py | 2 -- tests/m2o_recursive/tests.py | 2 -- tests/mail/test_sendtestemail.py | 2 -- tests/mail/tests.py | 3 --- tests/managers_regress/tests.py | 2 -- tests/many_to_many/models.py | 2 -- tests/many_to_many/tests.py | 2 -- tests/many_to_one/models.py | 2 -- tests/many_to_one_null/tests.py | 2 -- tests/max_lengths/tests.py | 2 -- tests/middleware/tests.py | 3 --- tests/middleware_exceptions/middleware.py | 2 -- .../custom_migrations/0001_initial.py | 3 --- .../migrations/0001_initial.py | 3 --- .../migrations/0002_add_book.py | 3 --- .../0001_initial.py | 3 --- .../0002_remove_ipaddressfield_ip.py | 3 --- .../author_app/migrations/0001_initial.py | 3 --- .../author_app/migrations/0002_alter_id.py | 3 --- .../book_app/migrations/0001_initial.py | 3 --- .../migrations/0001_initial.py | 3 --- .../migrations/0002_conflicting_second.py | 3 --- .../migrations/0002_second.py | 3 --- .../lookuperror_a/migrations/0001_initial.py | 3 --- .../lookuperror_a/migrations/0002_a2.py | 3 --- .../lookuperror_a/migrations/0003_a3.py | 3 --- .../lookuperror_a/migrations/0004_a4.py | 3 --- .../lookuperror_b/migrations/0001_initial.py | 3 --- .../lookuperror_b/migrations/0002_b2.py | 3 --- .../lookuperror_b/migrations/0003_b3.py | 3 --- .../lookuperror_c/migrations/0001_initial.py | 3 --- .../lookuperror_c/migrations/0002_c2.py | 3 --- .../lookuperror_c/migrations/0003_c3.py | 3 --- .../migrated_app/migrations/0001_initial.py | 3 --- .../migrations/0001_initial.py | 3 --- .../mutate_state_a/migrations/0001_initial.py | 3 --- .../mutate_state_b/migrations/0001_initial.py | 3 --- .../migrations/0002_add_field.py | 3 --- .../unmigrated_app/models.py | 3 --- .../migrations/0001_initial.py | 3 --- .../migrations/0002_conflicting_second.py | 3 --- .../migrations/0002_second.py | 3 --- tests/migrations/models.py | 3 --- .../0001_initial.py | 2 -- .../0002_initial.py | 2 -- .../test_auto_now_add/0001_initial.py | 3 --- tests/migrations/test_autodetector.py | 1 - tests/migrations/test_commands.py | 9 ------- tests/migrations/test_loader.py | 2 -- .../test_migrations/0001_initial.py | 3 --- .../migrations/test_migrations/0002_second.py | 3 --- .../0001_initial.py | 3 --- .../0001_initial.py | 3 --- .../0002_second.py | 3 --- .../test_migrations_conflict/0001_initial.py | 3 --- .../0002_conflicting_second.py | 3 --- .../test_migrations_conflict/0002_second.py | 3 --- .../0001_initial.py | 3 --- .../0001_initial.py | 3 --- .../0002_second.py | 3 --- .../test_migrations_first/second.py | 3 --- .../test_migrations_first/thefirst.py | 3 --- .../0001_not_initial.py | 3 --- .../0001_initial.py | 3 --- .../0002_conflicting_second.py | 3 --- .../0002_second.py | 3 --- .../0001_initial.py | 3 --- .../test_migrations_no_changes/0002_second.py | 3 --- .../test_migrations_no_changes/0003_third.py | 3 --- .../0001_initial.py | 3 --- .../0001_initial.py | 3 --- .../migrations/test_migrations_order/0001.py | 3 --- .../0001_initial.py | 3 --- .../test_migrations_run_before/0002_second.py | 3 --- .../test_migrations_run_before/0003_third.py | 3 --- .../test_migrations_squashed/0001_initial.py | 3 --- .../0001_squashed_0002.py | 3 --- .../test_migrations_squashed/0002_second.py | 3 --- .../1_auto.py | 3 --- .../2_auto.py | 3 --- .../3_auto.py | 3 --- .../3_squashed_5.py | 3 --- .../4_auto.py | 3 --- .../5_auto.py | 3 --- .../6_auto.py | 3 --- .../7_auto.py | 3 --- .../app1/1_auto.py | 3 --- .../app1/2_auto.py | 3 --- .../app1/2_squashed_3.py | 3 --- .../app1/3_auto.py | 3 --- .../app1/4_auto.py | 3 --- .../app2/1_auto.py | 3 --- .../app2/1_squashed_2.py | 3 --- .../app2/2_auto.py | 3 --- .../1_auto.py | 3 --- .../2_auto.py | 3 --- .../3_squashed_5.py | 3 --- .../6_auto.py | 3 --- .../7_auto.py | 3 --- .../0001_initial.py | 3 --- .../0001_squashed_0002.py | 3 --- .../0002_second.py | 3 --- .../0003_third.py | 3 --- .../app1/1_auto.py | 3 --- .../app1/2_auto.py | 3 --- .../app1/2_squashed_3.py | 3 --- .../app1/3_auto.py | 3 --- .../app1/4_auto.py | 3 --- .../app2/1_auto.py | 3 --- .../app2/1_squashed_2.py | 3 --- .../app2/2_auto.py | 3 --- .../test_migrations_unmigdep/0001_initial.py | 3 --- tests/migrations/test_operations.py | 2 -- tests/migrations/test_optimizer.py | 2 -- tests/migrations/test_questioner.py | 2 -- tests/migrations/test_writer.py | 4 --- .../test_migrations_2/0001_initial.py | 3 --- .../test_migrations_2_first/0001_initial.py | 3 --- .../test_migrations_2_first/0002_second.py | 3 --- .../test_migrations_2_no_deps/0001_initial.py | 3 --- tests/model_fields/test_charfield.py | 3 --- tests/model_fields/test_imagefield.py | 2 -- tests/model_fields/test_promises.py | 2 -- tests/model_fields/test_slugfield.py | 3 --- tests/model_fields/test_textfield.py | 3 --- tests/model_forms/models.py | 2 -- tests/model_forms/test_uuid.py | 2 -- tests/model_forms/tests.py | 2 -- tests/model_formsets/models.py | 2 -- tests/model_formsets/tests.py | 2 -- tests/model_formsets_regress/tests.py | 2 -- tests/model_inheritance/models.py | 2 -- .../test_abstract_inheritance.py | 2 -- tests/model_inheritance/tests.py | 2 -- tests/model_inheritance_regress/models.py | 2 -- tests/model_inheritance_regress/tests.py | 2 -- tests/model_options/test_tablespaces.py | 2 -- tests/model_package/tests.py | 2 -- tests/model_regress/models.py | 3 --- tests/model_regress/tests.py | 2 -- tests/modeladmin/models.py | 1 - tests/modeladmin/test_checks.py | 2 -- tests/modeladmin/tests.py | 2 -- tests/multiple_database/routers.py | 2 -- tests/multiple_database/tests.py | 2 -- tests/nested_foreign_keys/tests.py | 2 -- tests/null_fk/tests.py | 2 -- tests/null_fk_ordering/models.py | 2 -- tests/null_fk_ordering/tests.py | 2 -- tests/null_queries/models.py | 2 -- tests/null_queries/tests.py | 2 -- tests/one_to_one/models.py | 2 -- tests/one_to_one/tests.py | 2 -- tests/or_lookups/tests.py | 3 --- tests/order_with_respect_to/base_tests.py | 2 -- tests/order_with_respect_to/tests.py | 2 -- tests/ordering/tests.py | 2 -- tests/pagination/tests.py | 2 -- .../array_default_migrations/0001_initial.py | 3 --- .../0002_integerarraymodel_field_2.py | 3 --- .../array_index_migrations/0001_initial.py | 3 --- .../migrations/0001_setup_extensions.py | 3 --- .../migrations/0002_create_test_models.py | 3 --- tests/postgres_tests/test_hstore.py | 3 --- tests/postgres_tests/test_json.py | 2 -- tests/postgres_tests/test_unaccent.py | 3 --- tests/prefetch_related/test_uuid.py | 2 -- tests/prefetch_related/tests.py | 2 -- tests/properties/tests.py | 2 -- tests/proxy_model_inheritance/tests.py | 2 -- tests/proxy_models/tests.py | 2 -- tests/queries/models.py | 2 -- tests/queries/test_qs_combinators.py | 2 -- tests/queries/tests.py | 2 -- tests/queryset_pickle/tests.py | 2 -- tests/raw_query/tests.py | 2 -- tests/requests/tests.py | 3 --- tests/reserved_names/tests.py | 2 -- tests/resolve_url/tests.py | 2 -- tests/responses/tests.py | 4 --- tests/reverse_lookup/tests.py | 2 -- tests/save_delete_hooks/models.py | 2 -- tests/save_delete_hooks/tests.py | 2 -- tests/select_for_update/tests.py | 2 -- tests/select_related/tests.py | 2 -- tests/select_related_onetoone/tests.py | 2 -- tests/select_related_regress/models.py | 2 -- tests/select_related_regress/tests.py | 2 -- tests/serializers/models/base.py | 2 -- tests/serializers/models/data.py | 2 -- tests/serializers/test_data.py | 2 -- tests/serializers/test_json.py | 3 --- tests/serializers/test_natural.py | 2 -- tests/serializers/test_xml.py | 3 --- tests/serializers/test_yaml.py | 3 --- tests/serializers/tests.py | 3 --- tests/servers/tests.py | 3 --- tests/signals/models.py | 2 -- tests/signals/tests.py | 2 -- tests/signed_cookies_tests/tests.py | 2 -- tests/signing/tests.py | 2 -- tests/sitemaps_tests/test_generic.py | 2 -- tests/sitemaps_tests/test_http.py | 2 -- tests/sitemaps_tests/test_https.py | 2 -- .../migrations/0001_initial.py | 3 --- tests/sites_tests/tests.py | 2 -- tests/staticfiles_tests/cases.py | 3 --- tests/staticfiles_tests/settings.py | 2 -- tests/staticfiles_tests/test_finders.py | 2 -- tests/staticfiles_tests/test_management.py | 2 -- tests/staticfiles_tests/test_storage.py | 2 -- tests/staticfiles_tests/test_templatetags.py | 2 -- tests/staticfiles_tests/test_views.py | 2 -- tests/str/models.py | 1 - tests/str/tests.py | 3 --- tests/string_lookup/models.py | 3 --- tests/string_lookup/tests.py | 3 --- tests/swappable_models/tests.py | 2 -- tests/syndication_tests/feeds.py | 2 -- tests/syndication_tests/tests.py | 2 -- tests/template_backends/test_dummy.py | 4 --- tests/template_backends/test_jinja2.py | 4 --- .../filter_tests/test_escapejs.py | 2 -- .../filter_tests/test_filesizeformat.py | 2 -- .../filter_tests/test_floatformat.py | 3 --- .../filter_tests/test_force_escape.py | 3 --- .../filter_tests/test_iriencode.py | 3 --- .../template_tests/filter_tests/test_lower.py | 3 --- .../filter_tests/test_slugify.py | 3 --- .../filter_tests/test_timesince.py | 2 -- .../filter_tests/test_timeuntil.py | 2 -- .../template_tests/filter_tests/test_title.py | 3 --- .../filter_tests/test_truncatechars_html.py | 3 --- .../filter_tests/test_truncatewords_html.py | 3 --- .../template_tests/filter_tests/test_upper.py | 3 --- .../filter_tests/test_urlencode.py | 3 --- .../filter_tests/test_urlize.py | 3 --- .../template_tests/syntax_tests/i18n/base.py | 2 -- .../syntax_tests/i18n/test_blocktrans.py | 3 --- .../syntax_tests/i18n/test_filters.py | 3 --- .../i18n/test_get_available_languages.py | 2 -- .../i18n/test_get_language_info.py | 3 --- .../i18n/test_get_language_info_list.py | 3 --- .../syntax_tests/i18n/test_trans.py | 2 -- .../i18n/test_underscore_syntax.py | 2 -- .../syntax_tests/test_filter_syntax.py | 3 --- tests/template_tests/syntax_tests/test_url.py | 1 - tests/template_tests/test_callables.py | 2 -- tests/template_tests/test_context.py | 1 - tests/template_tests/test_custom.py | 2 -- tests/template_tests/test_loaders.py | 3 --- tests/template_tests/test_logging.py | 2 -- tests/template_tests/test_parser.py | 2 -- tests/template_tests/test_response.py | 2 -- tests/template_tests/test_unicode.py | 3 --- tests/template_tests/tests.py | 3 --- tests/template_tests/urls.py | 3 --- tests/template_tests/utils.py | 4 --- .../test_conditional_content_removal.py | 2 -- tests/test_client/tests.py | 3 --- tests/test_client_regress/tests.py | 3 --- tests/test_runner/tests.py | 2 -- tests/test_utils/tests.py | 3 --- tests/timezones/tests.py | 2 -- tests/transactions/models.py | 2 -- tests/transactions/tests.py | 2 -- tests/unmanaged_models/tests.py | 2 -- tests/update/tests.py | 2 -- tests/update_only_fields/tests.py | 2 -- .../test_localeregexprovider.py | 2 -- tests/urlpatterns_reverse/tests.py | 3 --- tests/urlpatterns_reverse/utils.py | 2 -- tests/utils_tests/test_crypto.py | 2 -- tests/utils_tests/test_dateformat.py | 2 -- tests/utils_tests/test_dateparse.py | 2 -- tests/utils_tests/test_encoding.py | 3 --- tests/utils_tests/test_feedgenerator.py | 2 -- tests/utils_tests/test_functional.py | 3 --- tests/utils_tests/test_glob.py | 2 -- tests/utils_tests/test_html.py | 3 --- tests/utils_tests/test_http.py | 3 --- tests/utils_tests/test_ipv6.py | 2 -- tests/utils_tests/test_jslex.py | 2 -- tests/utils_tests/test_lazyobject.py | 2 -- tests/utils_tests/test_lorem_ipsum.py | 3 --- tests/utils_tests/test_numberformat.py | 3 --- tests/utils_tests/test_regex_helper.py | 2 -- tests/utils_tests/test_safestring.py | 2 -- tests/utils_tests/test_simplelazyobject.py | 2 -- tests/utils_tests/test_text.py | 3 --- tests/utils_tests/test_timesince.py | 2 -- tests/validation/models.py | 2 -- tests/validation/test_error_messages.py | 3 --- tests/validation/test_unique.py | 2 -- tests/validation/test_validators.py | 2 -- tests/validation/tests.py | 2 -- tests/validators/tests.py | 3 --- tests/view_tests/__init__.py | 4 --- tests/view_tests/generic_urls.py | 3 --- tests/view_tests/tests/test_debug.py | 5 ---- tests/view_tests/tests/test_defaults.py | 2 -- tests/view_tests/tests/test_i18n.py | 3 --- tests/view_tests/tests/test_json.py | 3 --- tests/view_tests/tests/test_specials.py | 3 --- tests/view_tests/tests/test_static.py | 2 -- tests/view_tests/urls.py | 1 - tests/view_tests/views.py | 2 -- tests/wsgi/tests.py | 2 -- 831 files changed, 6 insertions(+), 2066 deletions(-) diff --git a/django/__init__.py b/django/__init__.py index ab50cac624..4da99681ee 100644 --- a/django/__init__.py +++ b/django/__init__.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.utils.version import get_version VERSION = (2, 0, 0, 'alpha', 0) diff --git a/django/conf/app_template/admin.py-tpl b/django/conf/app_template/admin.py-tpl index b2ff964e3b..8c38f3f3da 100644 --- a/django/conf/app_template/admin.py-tpl +++ b/django/conf/app_template/admin.py-tpl @@ -1,3 +1,3 @@ -{{ unicode_literals }}from django.contrib import admin +from django.contrib import admin # Register your models here. diff --git a/django/conf/app_template/apps.py-tpl b/django/conf/app_template/apps.py-tpl index 8d1a017751..9b2ce5289c 100644 --- a/django/conf/app_template/apps.py-tpl +++ b/django/conf/app_template/apps.py-tpl @@ -1,4 +1,4 @@ -{{ unicode_literals }}from django.apps import AppConfig +from django.apps import AppConfig class {{ camel_case_app_name }}Config(AppConfig): diff --git a/django/conf/app_template/models.py-tpl b/django/conf/app_template/models.py-tpl index 7a54b3e371..71a8362390 100644 --- a/django/conf/app_template/models.py-tpl +++ b/django/conf/app_template/models.py-tpl @@ -1,3 +1,3 @@ -{{ unicode_literals }}from django.db import models +from django.db import models # Create your models here. diff --git a/django/conf/app_template/tests.py-tpl b/django/conf/app_template/tests.py-tpl index fa96c654d5..7ce503c2dd 100644 --- a/django/conf/app_template/tests.py-tpl +++ b/django/conf/app_template/tests.py-tpl @@ -1,3 +1,3 @@ -{{ unicode_literals }}from django.test import TestCase +from django.test import TestCase # Create your tests here. diff --git a/django/conf/app_template/views.py-tpl b/django/conf/app_template/views.py-tpl index 61821e705e..91ea44a218 100644 --- a/django/conf/app_template/views.py-tpl +++ b/django/conf/app_template/views.py-tpl @@ -1,3 +1,3 @@ -{{ unicode_literals }}from django.shortcuts import render +from django.shortcuts import render # Create your views here. diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 9cf2732d30..754e6e5cdf 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -1,9 +1,7 @@ -# -*- coding: utf-8 -*- """ Default Django settings. Override these with settings in the module pointed to by the DJANGO_SETTINGS_MODULE environment variable. """ -from __future__ import unicode_literals # This is defined here as a do-nothing function because we can't import diff --git a/django/conf/locale/__init__.py b/django/conf/locale/__init__.py index 2cdda3cffd..89504ce1e5 100644 --- a/django/conf/locale/__init__.py +++ b/django/conf/locale/__init__.py @@ -1,6 +1,3 @@ -# -*- encoding: utf-8 -*- -from __future__ import unicode_literals - """ LANG_INFO is a dictionary structure to provide meta information about languages. diff --git a/django/conf/locale/ar/formats.py b/django/conf/locale/ar/formats.py index 1cdba2d984..770b453448 100644 --- a/django/conf/locale/ar/formats.py +++ b/django/conf/locale/ar/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F، Y' diff --git a/django/conf/locale/az/formats.py b/django/conf/locale/az/formats.py index ceb8165d65..82470d1f16 100644 --- a/django/conf/locale/az/formats.py +++ b/django/conf/locale/az/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j E Y' diff --git a/django/conf/locale/bg/formats.py b/django/conf/locale/bg/formats.py index 98820e703f..4013dad1a8 100644 --- a/django/conf/locale/bg/formats.py +++ b/django/conf/locale/bg/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd F Y' diff --git a/django/conf/locale/bn/formats.py b/django/conf/locale/bn/formats.py index 2348c3afa3..ed03b21c69 100644 --- a/django/conf/locale/bn/formats.py +++ b/django/conf/locale/bn/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F, Y' diff --git a/django/conf/locale/bs/formats.py b/django/conf/locale/bs/formats.py index cce3900f1e..4018515dfb 100644 --- a/django/conf/locale/bs/formats.py +++ b/django/conf/locale/bs/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j. N Y.' diff --git a/django/conf/locale/ca/formats.py b/django/conf/locale/ca/formats.py index d42016b716..baf47432bc 100644 --- a/django/conf/locale/ca/formats.py +++ b/django/conf/locale/ca/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'j \d\e F \d\e Y' diff --git a/django/conf/locale/cs/formats.py b/django/conf/locale/cs/formats.py index 3f2d3fa70e..ba4e3a1f8b 100644 --- a/django/conf/locale/cs/formats.py +++ b/django/conf/locale/cs/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j. E Y' diff --git a/django/conf/locale/cy/formats.py b/django/conf/locale/cy/formats.py index 4a69a88e6a..031a40fff6 100644 --- a/django/conf/locale/cy/formats.py +++ b/django/conf/locale/cy/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' # '25 Hydref 2006' diff --git a/django/conf/locale/da/formats.py b/django/conf/locale/da/formats.py index 90ba056f79..3af215895c 100644 --- a/django/conf/locale/da/formats.py +++ b/django/conf/locale/da/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j. F Y' diff --git a/django/conf/locale/de/formats.py b/django/conf/locale/de/formats.py index cf1283b2a5..d47f57af35 100644 --- a/django/conf/locale/de/formats.py +++ b/django/conf/locale/de/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j. F Y' diff --git a/django/conf/locale/de_CH/formats.py b/django/conf/locale/de_CH/formats.py index f8a9b90631..e09f9ffebd 100644 --- a/django/conf/locale/de_CH/formats.py +++ b/django/conf/locale/de_CH/formats.py @@ -1,11 +1,7 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date -from __future__ import unicode_literals - DATE_FORMAT = 'j. F Y' TIME_FORMAT = 'H:i' DATETIME_FORMAT = 'j. F Y H:i' diff --git a/django/conf/locale/el/formats.py b/django/conf/locale/el/formats.py index bafa461094..3db1ad4829 100644 --- a/django/conf/locale/el/formats.py +++ b/django/conf/locale/el/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd/m/Y' diff --git a/django/conf/locale/en/formats.py b/django/conf/locale/en/formats.py index 63b23fa260..dd226fc129 100644 --- a/django/conf/locale/en/formats.py +++ b/django/conf/locale/en/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'N j, Y' diff --git a/django/conf/locale/en_AU/formats.py b/django/conf/locale/en_AU/formats.py index fe97ea98c1..378c183207 100644 --- a/django/conf/locale/en_AU/formats.py +++ b/django/conf/locale/en_AU/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j M Y' # '25 Oct 2006' diff --git a/django/conf/locale/en_GB/formats.py b/django/conf/locale/en_GB/formats.py index 190ec7316d..5f906881f7 100644 --- a/django/conf/locale/en_GB/formats.py +++ b/django/conf/locale/en_GB/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j M Y' # '25 Oct 2006' diff --git a/django/conf/locale/eo/formats.py b/django/conf/locale/eo/formats.py index 1e61912442..430fc8f242 100644 --- a/django/conf/locale/eo/formats.py +++ b/django/conf/locale/eo/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'j\-\a \d\e F Y' # '26-a de julio 1887' diff --git a/django/conf/locale/es/formats.py b/django/conf/locale/es/formats.py index 701032aefd..c89e66b307 100644 --- a/django/conf/locale/es/formats.py +++ b/django/conf/locale/es/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'j \d\e F \d\e Y' diff --git a/django/conf/locale/es_AR/formats.py b/django/conf/locale/es_AR/formats.py index 9daf38d8ef..30058a1398 100644 --- a/django/conf/locale/es_AR/formats.py +++ b/django/conf/locale/es_AR/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'j N Y' diff --git a/django/conf/locale/es_CO/formats.py b/django/conf/locale/es_CO/formats.py index 3671a0a254..cefbe26dae 100644 --- a/django/conf/locale/es_CO/formats.py +++ b/django/conf/locale/es_CO/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - DATE_FORMAT = r'j \d\e F \d\e Y' TIME_FORMAT = 'H:i' DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\a\s H:i' diff --git a/django/conf/locale/es_MX/formats.py b/django/conf/locale/es_MX/formats.py index d15041660d..228a821716 100644 --- a/django/conf/locale/es_MX/formats.py +++ b/django/conf/locale/es_MX/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - DATE_FORMAT = r'j \d\e F \d\e Y' TIME_FORMAT = 'H:i' DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\a\s H:i' diff --git a/django/conf/locale/es_NI/formats.py b/django/conf/locale/es_NI/formats.py index cc03b2cd2c..2eacf506ee 100644 --- a/django/conf/locale/es_NI/formats.py +++ b/django/conf/locale/es_NI/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - DATE_FORMAT = r'j \d\e F \d\e Y' TIME_FORMAT = 'H:i' DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\a\s H:i' diff --git a/django/conf/locale/es_PR/formats.py b/django/conf/locale/es_PR/formats.py index c6680f7975..7f53ef9fe2 100644 --- a/django/conf/locale/es_PR/formats.py +++ b/django/conf/locale/es_PR/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - DATE_FORMAT = r'j \d\e F \d\e Y' TIME_FORMAT = 'H:i' DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\a\s H:i' diff --git a/django/conf/locale/et/formats.py b/django/conf/locale/et/formats.py index d43da89dd3..8c23b1053e 100644 --- a/django/conf/locale/et/formats.py +++ b/django/conf/locale/et/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j. F Y' diff --git a/django/conf/locale/eu/formats.py b/django/conf/locale/eu/formats.py index 4ddf04ef5a..8d2785183f 100644 --- a/django/conf/locale/eu/formats.py +++ b/django/conf/locale/eu/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'Yeko M\re\n d\a' diff --git a/django/conf/locale/fa/formats.py b/django/conf/locale/fa/formats.py index c1678b81cd..419a9a24c1 100644 --- a/django/conf/locale/fa/formats.py +++ b/django/conf/locale/fa/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' diff --git a/django/conf/locale/fi/formats.py b/django/conf/locale/fi/formats.py index b5c74211a3..2bdec1400e 100644 --- a/django/conf/locale/fi/formats.py +++ b/django/conf/locale/fi/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j. E Y' diff --git a/django/conf/locale/fr/formats.py b/django/conf/locale/fr/formats.py index ed6d8c7aaa..6db0b01dda 100644 --- a/django/conf/locale/fr/formats.py +++ b/django/conf/locale/fr/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' diff --git a/django/conf/locale/fy/formats.py b/django/conf/locale/fy/formats.py index 330c2f296e..9dd995dde2 100644 --- a/django/conf/locale/fy/formats.py +++ b/django/conf/locale/fy/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date # DATE_FORMAT = diff --git a/django/conf/locale/ga/formats.py b/django/conf/locale/ga/formats.py index b3b1974076..e47d873fa2 100644 --- a/django/conf/locale/ga/formats.py +++ b/django/conf/locale/ga/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' diff --git a/django/conf/locale/gd/formats.py b/django/conf/locale/gd/formats.py index 0eac972669..4a2db23131 100644 --- a/django/conf/locale/gd/formats.py +++ b/django/conf/locale/gd/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' diff --git a/django/conf/locale/gl/formats.py b/django/conf/locale/gl/formats.py index 996b8cd6b4..2dac9599d8 100644 --- a/django/conf/locale/gl/formats.py +++ b/django/conf/locale/gl/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'j \d\e F \d\e Y' diff --git a/django/conf/locale/he/formats.py b/django/conf/locale/he/formats.py index 274996f3a0..550d9bfefc 100644 --- a/django/conf/locale/he/formats.py +++ b/django/conf/locale/he/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j בF Y' diff --git a/django/conf/locale/hi/formats.py b/django/conf/locale/hi/formats.py index a2ea2e0bf6..799168d83a 100644 --- a/django/conf/locale/hi/formats.py +++ b/django/conf/locale/hi/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' diff --git a/django/conf/locale/hr/formats.py b/django/conf/locale/hr/formats.py index 59bcb8657d..921c709406 100644 --- a/django/conf/locale/hr/formats.py +++ b/django/conf/locale/hr/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j. E Y.' diff --git a/django/conf/locale/hu/formats.py b/django/conf/locale/hu/formats.py index e17e8c99ad..33b9b6e225 100644 --- a/django/conf/locale/hu/formats.py +++ b/django/conf/locale/hu/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'Y. F j.' diff --git a/django/conf/locale/id/formats.py b/django/conf/locale/id/formats.py index dc3dbf9dd8..065e0329d1 100644 --- a/django/conf/locale/id/formats.py +++ b/django/conf/locale/id/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j N Y' diff --git a/django/conf/locale/is/formats.py b/django/conf/locale/is/formats.py index 1b328eff1f..6fbaa2a1c8 100644 --- a/django/conf/locale/is/formats.py +++ b/django/conf/locale/is/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j. F Y' diff --git a/django/conf/locale/it/formats.py b/django/conf/locale/it/formats.py index 054b973f0a..b4819c0253 100644 --- a/django/conf/locale/it/formats.py +++ b/django/conf/locale/it/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd F Y' # 25 Ottobre 2006 diff --git a/django/conf/locale/ja/formats.py b/django/conf/locale/ja/formats.py index 63f043872a..20194519b5 100644 --- a/django/conf/locale/ja/formats.py +++ b/django/conf/locale/ja/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'Y年n月j日' diff --git a/django/conf/locale/ka/formats.py b/django/conf/locale/ka/formats.py index 226f5f721e..e91c577c8d 100644 --- a/django/conf/locale/ka/formats.py +++ b/django/conf/locale/ka/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'l, j F, Y' diff --git a/django/conf/locale/km/formats.py b/django/conf/locale/km/formats.py index 52ff4f95e8..b214a81c91 100644 --- a/django/conf/locale/km/formats.py +++ b/django/conf/locale/km/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j ខែ F ឆ្នាំ Y' diff --git a/django/conf/locale/kn/formats.py b/django/conf/locale/kn/formats.py index 4b8355165e..568c65dc65 100644 --- a/django/conf/locale/kn/formats.py +++ b/django/conf/locale/kn/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' diff --git a/django/conf/locale/ko/formats.py b/django/conf/locale/ko/formats.py index 0344e9e161..5183a78274 100644 --- a/django/conf/locale/ko/formats.py +++ b/django/conf/locale/ko/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'Y년 n월 j일' diff --git a/django/conf/locale/lt/formats.py b/django/conf/locale/lt/formats.py index d688669b78..4fd47c0f77 100644 --- a/django/conf/locale/lt/formats.py +++ b/django/conf/locale/lt/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'Y \m. E j \d.' diff --git a/django/conf/locale/lv/formats.py b/django/conf/locale/lv/formats.py index e30a65388c..8b6c730ee9 100644 --- a/django/conf/locale/lv/formats.py +++ b/django/conf/locale/lv/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'Y. \g\a\d\a j. F' diff --git a/django/conf/locale/mk/formats.py b/django/conf/locale/mk/formats.py index 2f01147a0a..ef168e5d21 100644 --- a/django/conf/locale/mk/formats.py +++ b/django/conf/locale/mk/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd F Y' diff --git a/django/conf/locale/ml/formats.py b/django/conf/locale/ml/formats.py index 63b23fa260..dd226fc129 100644 --- a/django/conf/locale/ml/formats.py +++ b/django/conf/locale/ml/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'N j, Y' diff --git a/django/conf/locale/mn/formats.py b/django/conf/locale/mn/formats.py index f41d532ba9..506e614320 100644 --- a/django/conf/locale/mn/formats.py +++ b/django/conf/locale/mn/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd F Y' diff --git a/django/conf/locale/nb/formats.py b/django/conf/locale/nb/formats.py index 09fa857b4c..8cfb6f854c 100644 --- a/django/conf/locale/nb/formats.py +++ b/django/conf/locale/nb/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j. F Y' diff --git a/django/conf/locale/nl/formats.py b/django/conf/locale/nl/formats.py index 581848f6e4..69e8e80615 100644 --- a/django/conf/locale/nl/formats.py +++ b/django/conf/locale/nl/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' # '20 januari 2009' diff --git a/django/conf/locale/nn/formats.py b/django/conf/locale/nn/formats.py index b2e654c1e1..24289035fc 100644 --- a/django/conf/locale/nn/formats.py +++ b/django/conf/locale/nn/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j. F Y' diff --git a/django/conf/locale/pl/formats.py b/django/conf/locale/pl/formats.py index 9cc1776494..ddd82742cd 100644 --- a/django/conf/locale/pl/formats.py +++ b/django/conf/locale/pl/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j E Y' diff --git a/django/conf/locale/pt/formats.py b/django/conf/locale/pt/formats.py index 143351c0cd..60f9b1b5fd 100644 --- a/django/conf/locale/pt/formats.py +++ b/django/conf/locale/pt/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'j \d\e F \d\e Y' diff --git a/django/conf/locale/pt_BR/formats.py b/django/conf/locale/pt_BR/formats.py index 9f728783c5..0c0646c946 100644 --- a/django/conf/locale/pt_BR/formats.py +++ b/django/conf/locale/pt_BR/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'j \d\e F \d\e Y' diff --git a/django/conf/locale/ro/formats.py b/django/conf/locale/ro/formats.py index 4ed143b745..ba3fd73b4a 100644 --- a/django/conf/locale/ro/formats.py +++ b/django/conf/locale/ro/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' diff --git a/django/conf/locale/ru/formats.py b/django/conf/locale/ru/formats.py index 07b1181285..c443ae1bd0 100644 --- a/django/conf/locale/ru/formats.py +++ b/django/conf/locale/ru/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j E Y г.' diff --git a/django/conf/locale/sk/formats.py b/django/conf/locale/sk/formats.py index 04bdceb000..c6a40bbc49 100644 --- a/django/conf/locale/sk/formats.py +++ b/django/conf/locale/sk/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j. F Y' diff --git a/django/conf/locale/sl/formats.py b/django/conf/locale/sl/formats.py index a4e9973a55..65ad2592e1 100644 --- a/django/conf/locale/sl/formats.py +++ b/django/conf/locale/sl/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd. F Y' diff --git a/django/conf/locale/sq/formats.py b/django/conf/locale/sq/formats.py index 0fb21a6583..ef9cb6a755 100644 --- a/django/conf/locale/sq/formats.py +++ b/django/conf/locale/sq/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd F Y' diff --git a/django/conf/locale/sr/formats.py b/django/conf/locale/sr/formats.py index 5c5e48e20e..06089d6a91 100644 --- a/django/conf/locale/sr/formats.py +++ b/django/conf/locale/sr/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j. F Y.' diff --git a/django/conf/locale/sr_Latn/formats.py b/django/conf/locale/sr_Latn/formats.py index 5c5e48e20e..06089d6a91 100644 --- a/django/conf/locale/sr_Latn/formats.py +++ b/django/conf/locale/sr_Latn/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j. F Y.' diff --git a/django/conf/locale/sv/formats.py b/django/conf/locale/sv/formats.py index f2de0bc16b..3ab4b0b86d 100644 --- a/django/conf/locale/sv/formats.py +++ b/django/conf/locale/sv/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' diff --git a/django/conf/locale/ta/formats.py b/django/conf/locale/ta/formats.py index 8928244709..c1a1be6aee 100644 --- a/django/conf/locale/ta/formats.py +++ b/django/conf/locale/ta/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F, Y' diff --git a/django/conf/locale/te/formats.py b/django/conf/locale/te/formats.py index 74420d0ea1..59693985e3 100644 --- a/django/conf/locale/te/formats.py +++ b/django/conf/locale/te/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' diff --git a/django/conf/locale/th/formats.py b/django/conf/locale/th/formats.py index 1b0e2d4f91..04ceda1c92 100644 --- a/django/conf/locale/th/formats.py +++ b/django/conf/locale/th/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'j F Y' diff --git a/django/conf/locale/tr/formats.py b/django/conf/locale/tr/formats.py index c765f77489..6bb62fc1c4 100644 --- a/django/conf/locale/tr/formats.py +++ b/django/conf/locale/tr/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd F Y' diff --git a/django/conf/locale/uk/formats.py b/django/conf/locale/uk/formats.py index 938a97d42a..515d48d835 100644 --- a/django/conf/locale/uk/formats.py +++ b/django/conf/locale/uk/formats.py @@ -1,9 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # - -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd E Y р.' diff --git a/django/conf/locale/vi/formats.py b/django/conf/locale/vi/formats.py index ee87e2f326..78ec196d38 100644 --- a/django/conf/locale/vi/formats.py +++ b/django/conf/locale/vi/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = r'\N\gà\y d \t\há\n\g n \nă\m Y' diff --git a/django/conf/locale/zh_Hans/formats.py b/django/conf/locale/zh_Hans/formats.py index b6bac2f90e..863b8980dd 100644 --- a/django/conf/locale/zh_Hans/formats.py +++ b/django/conf/locale/zh_Hans/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'Y年n月j日' # 2016年9月5日 diff --git a/django/conf/locale/zh_Hant/formats.py b/django/conf/locale/zh_Hant/formats.py index b6bac2f90e..863b8980dd 100644 --- a/django/conf/locale/zh_Hant/formats.py +++ b/django/conf/locale/zh_Hant/formats.py @@ -1,8 +1,5 @@ -# -*- encoding: utf-8 -*- # This file is distributed under the same license as the Django package. # -from __future__ import unicode_literals - # The *_FORMAT strings use the Django date format syntax, # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'Y年n月j日' # 2016年9月5日 diff --git a/django/contrib/admin/checks.py b/django/contrib/admin/checks.py index 286c1169a4..33c60a3ab8 100644 --- a/django/contrib/admin/checks.py +++ b/django/contrib/admin/checks.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from itertools import chain from django.apps import apps diff --git a/django/contrib/admin/forms.py b/django/contrib/admin/forms.py index ed71d63e4c..7c3d196012 100644 --- a/django/contrib/admin/forms.py +++ b/django/contrib/admin/forms.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import forms from django.contrib.auth.forms import AuthenticationForm, PasswordChangeForm from django.utils.translation import ugettext_lazy as _ diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py index 604fcd5b26..ea56840445 100644 --- a/django/contrib/admin/helpers.py +++ b/django/contrib/admin/helpers.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import json from django import forms diff --git a/django/contrib/admin/migrations/0001_initial.py b/django/contrib/admin/migrations/0001_initial.py index c615bd79c3..f1e2804ce4 100644 --- a/django/contrib/admin/migrations/0001_initial.py +++ b/django/contrib/admin/migrations/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import django.contrib.admin.models from django.conf import settings from django.db import migrations, models diff --git a/django/contrib/admin/migrations/0002_logentry_remove_auto_add.py b/django/contrib/admin/migrations/0002_logentry_remove_auto_add.py index fb66c31bd3..a2b19162f2 100644 --- a/django/contrib/admin/migrations/0002_logentry_remove_auto_add.py +++ b/django/contrib/admin/migrations/0002_logentry_remove_auto_add.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models from django.utils import timezone diff --git a/django/contrib/admin/models.py b/django/contrib/admin/models.py index a8245a20e4..724209dd0d 100644 --- a/django/contrib/admin/models.py +++ b/django/contrib/admin/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import json from django.conf import settings diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index aef1e2c24e..edde9077ac 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import copy import json import operator diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py index ad6c03ea89..ec4356f546 100644 --- a/django/contrib/admin/templatetags/admin_list.py +++ b/django/contrib/admin/templatetags/admin_list.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime from django.contrib.admin.templatetags.admin_urls import add_preserved_filters diff --git a/django/contrib/admin/utils.py b/django/contrib/admin/utils.py index 1e13d13d31..cf17381548 100644 --- a/django/contrib/admin/utils.py +++ b/django/contrib/admin/utils.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import decimal from collections import defaultdict diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py index 5960f82d91..9f93ae3a42 100644 --- a/django/contrib/admin/widgets.py +++ b/django/contrib/admin/widgets.py @@ -1,8 +1,6 @@ """ Form Widget classes specific to the Django admin site. """ -from __future__ import unicode_literals - import copy from django import forms diff --git a/django/contrib/auth/backends.py b/django/contrib/auth/backends.py index 8df95db5ee..08a20c61ff 100644 --- a/django/contrib/auth/backends.py +++ b/django/contrib/auth/backends.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.auth import get_user_model from django.contrib.auth.models import Permission diff --git a/django/contrib/auth/base_user.py b/django/contrib/auth/base_user.py index 104748ff69..c6f4c9665c 100644 --- a/django/contrib/auth/base_user.py +++ b/django/contrib/auth/base_user.py @@ -2,8 +2,6 @@ This module allows importing AbstractBaseUser even when django.contrib.auth is not in INSTALLED_APPS. """ -from __future__ import unicode_literals - import unicodedata from django.contrib.auth import password_validation diff --git a/django/contrib/auth/checks.py b/django/contrib/auth/checks.py index 05487fe536..ec133e80ee 100644 --- a/django/contrib/auth/checks.py +++ b/django/contrib/auth/checks.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from itertools import chain from types import MethodType diff --git a/django/contrib/auth/forms.py b/django/contrib/auth/forms.py index 02250d83da..51c513cb67 100644 --- a/django/contrib/auth/forms.py +++ b/django/contrib/auth/forms.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import unicodedata from django import forms diff --git a/django/contrib/auth/hashers.py b/django/contrib/auth/hashers.py index c29b27d64b..4b8b12782e 100644 --- a/django/contrib/auth/hashers.py +++ b/django/contrib/auth/hashers.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import base64 import binascii import hashlib diff --git a/django/contrib/auth/management/__init__.py b/django/contrib/auth/management/__init__.py index 659fe63282..17fd8dd11a 100644 --- a/django/contrib/auth/management/__init__.py +++ b/django/contrib/auth/management/__init__.py @@ -1,8 +1,6 @@ """ Creates permissions for all installed apps that need permissions. """ -from __future__ import unicode_literals - import getpass import unicodedata diff --git a/django/contrib/auth/management/commands/changepassword.py b/django/contrib/auth/management/commands/changepassword.py index 1c4eee3b91..c0c4ce3c61 100644 --- a/django/contrib/auth/management/commands/changepassword.py +++ b/django/contrib/auth/management/commands/changepassword.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import getpass from django.contrib.auth import get_user_model diff --git a/django/contrib/auth/management/commands/createsuperuser.py b/django/contrib/auth/management/commands/createsuperuser.py index 76971b7b72..b9f13b7b05 100644 --- a/django/contrib/auth/management/commands/createsuperuser.py +++ b/django/contrib/auth/management/commands/createsuperuser.py @@ -1,8 +1,6 @@ """ Management utility to create superusers. """ -from __future__ import unicode_literals - import getpass import sys diff --git a/django/contrib/auth/migrations/0001_initial.py b/django/contrib/auth/migrations/0001_initial.py index 65db802ed8..f97caae1e4 100644 --- a/django/contrib/auth/migrations/0001_initial.py +++ b/django/contrib/auth/migrations/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import django.contrib.auth.models from django.contrib.auth import validators from django.db import migrations, models diff --git a/django/contrib/auth/migrations/0002_alter_permission_name_max_length.py b/django/contrib/auth/migrations/0002_alter_permission_name_max_length.py index 8b58e7814b..556c320409 100644 --- a/django/contrib/auth/migrations/0002_alter_permission_name_max_length.py +++ b/django/contrib/auth/migrations/0002_alter_permission_name_max_length.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/django/contrib/auth/migrations/0003_alter_user_email_max_length.py b/django/contrib/auth/migrations/0003_alter_user_email_max_length.py index 0a082f2656..ee8a9bd607 100644 --- a/django/contrib/auth/migrations/0003_alter_user_email_max_length.py +++ b/django/contrib/auth/migrations/0003_alter_user_email_max_length.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/django/contrib/auth/migrations/0004_alter_user_username_opts.py b/django/contrib/auth/migrations/0004_alter_user_username_opts.py index e7a521fd6d..f4afcf7bd8 100644 --- a/django/contrib/auth/migrations/0004_alter_user_username_opts.py +++ b/django/contrib/auth/migrations/0004_alter_user_username_opts.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.contrib.auth import validators from django.db import migrations, models from django.utils import six diff --git a/django/contrib/auth/migrations/0005_alter_user_last_login_null.py b/django/contrib/auth/migrations/0005_alter_user_last_login_null.py index b8b9289787..97cd105a0f 100644 --- a/django/contrib/auth/migrations/0005_alter_user_last_login_null.py +++ b/django/contrib/auth/migrations/0005_alter_user_last_login_null.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/django/contrib/auth/migrations/0006_require_contenttypes_0002.py b/django/contrib/auth/migrations/0006_require_contenttypes_0002.py index 77c45e70b1..48c26be011 100644 --- a/django/contrib/auth/migrations/0006_require_contenttypes_0002.py +++ b/django/contrib/auth/migrations/0006_require_contenttypes_0002.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/django/contrib/auth/migrations/0007_alter_validators_add_error_messages.py b/django/contrib/auth/migrations/0007_alter_validators_add_error_messages.py index 8e5b141503..6d44280856 100644 --- a/django/contrib/auth/migrations/0007_alter_validators_add_error_messages.py +++ b/django/contrib/auth/migrations/0007_alter_validators_add_error_messages.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.contrib.auth import validators from django.db import migrations, models from django.utils import six diff --git a/django/contrib/auth/migrations/0008_alter_user_username_max_length.py b/django/contrib/auth/migrations/0008_alter_user_username_max_length.py index 6349ad10c4..15b9cf8c94 100644 --- a/django/contrib/auth/migrations/0008_alter_user_username_max_length.py +++ b/django/contrib/auth/migrations/0008_alter_user_username_max_length.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.contrib.auth import validators from django.db import migrations, models from django.utils import six diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py index d91412eb5c..2e9f3682d7 100644 --- a/django/contrib/auth/models.py +++ b/django/contrib/auth/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib import auth from django.contrib.auth.base_user import AbstractBaseUser, BaseUserManager from django.contrib.auth.signals import user_logged_in diff --git a/django/contrib/auth/password_validation.py b/django/contrib/auth/password_validation.py index 4ff2c409ec..d802a5f5fd 100644 --- a/django/contrib/auth/password_validation.py +++ b/django/contrib/auth/password_validation.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import gzip import os import re diff --git a/django/contrib/contenttypes/admin.py b/django/contrib/contenttypes/admin.py index f15f66b2e1..063c37698a 100644 --- a/django/contrib/contenttypes/admin.py +++ b/django/contrib/contenttypes/admin.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from functools import partial from django.contrib.admin.checks import InlineModelAdminChecks diff --git a/django/contrib/contenttypes/checks.py b/django/contrib/contenttypes/checks.py index 43a2fb7a7a..2355a5e943 100644 --- a/django/contrib/contenttypes/checks.py +++ b/django/contrib/contenttypes/checks.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from itertools import chain from django.apps import apps diff --git a/django/contrib/contenttypes/fields.py b/django/contrib/contenttypes/fields.py index a273cf0347..83e38af441 100644 --- a/django/contrib/contenttypes/fields.py +++ b/django/contrib/contenttypes/fields.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from collections import defaultdict from django.contrib.contenttypes.models import ContentType diff --git a/django/contrib/contenttypes/forms.py b/django/contrib/contenttypes/forms.py index ff8a60114c..8e88c9a1cd 100644 --- a/django/contrib/contenttypes/forms.py +++ b/django/contrib/contenttypes/forms.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.contenttypes.models import ContentType from django.db import models from django.forms import ModelForm, modelformset_factory diff --git a/django/contrib/contenttypes/migrations/0001_initial.py b/django/contrib/contenttypes/migrations/0001_initial.py index 68190b2a2b..9bafd098e9 100644 --- a/django/contrib/contenttypes/migrations/0001_initial.py +++ b/django/contrib/contenttypes/migrations/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import django.contrib.contenttypes.models from django.db import migrations, models diff --git a/django/contrib/contenttypes/migrations/0002_remove_content_type_name.py b/django/contrib/contenttypes/migrations/0002_remove_content_type_name.py index 8bd8032b41..c88e603147 100644 --- a/django/contrib/contenttypes/migrations/0002_remove_content_type_name.py +++ b/django/contrib/contenttypes/migrations/0002_remove_content_type_name.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/django/contrib/contenttypes/models.py b/django/contrib/contenttypes/models.py index 26a3db17c9..6db6831fbc 100644 --- a/django/contrib/contenttypes/models.py +++ b/django/contrib/contenttypes/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from collections import defaultdict from django.apps import apps diff --git a/django/contrib/contenttypes/views.py b/django/contrib/contenttypes/views.py index 3957788d0e..50c07d1109 100644 --- a/django/contrib/contenttypes/views.py +++ b/django/contrib/contenttypes/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import http from django.apps import apps from django.contrib.contenttypes.models import ContentType diff --git a/django/contrib/flatpages/migrations/0001_initial.py b/django/contrib/flatpages/migrations/0001_initial.py index 13e417b41b..b385ca5fd4 100644 --- a/django/contrib/flatpages/migrations/0001_initial.py +++ b/django/contrib/flatpages/migrations/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/django/contrib/flatpages/models.py b/django/contrib/flatpages/models.py index add1fdd879..02c93d657d 100644 --- a/django/contrib/flatpages/models.py +++ b/django/contrib/flatpages/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.sites.models import Site from django.db import models from django.urls import get_script_prefix diff --git a/django/contrib/gis/db/backends/postgis/adapter.py b/django/contrib/gis/db/backends/postgis/adapter.py index 9e107db6d6..c94268811b 100644 --- a/django/contrib/gis/db/backends/postgis/adapter.py +++ b/django/contrib/gis/db/backends/postgis/adapter.py @@ -1,8 +1,6 @@ """ This object provides quoting for GEOS geometries into PostgreSQL/PostGIS. """ -from __future__ import unicode_literals - from psycopg2 import Binary from psycopg2.extensions import ISQLQuote diff --git a/django/contrib/gis/db/models/lookups.py b/django/contrib/gis/db/models/lookups.py index 8d4e8229e7..b707a9cbff 100644 --- a/django/contrib/gis/db/models/lookups.py +++ b/django/contrib/gis/db/models/lookups.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import re from django.core.exceptions import FieldDoesNotExist diff --git a/django/contrib/gis/db/models/sql/conversion.py b/django/contrib/gis/db/models/sql/conversion.py index acc277ed62..054628d481 100644 --- a/django/contrib/gis/db/models/sql/conversion.py +++ b/django/contrib/gis/db/models/sql/conversion.py @@ -2,8 +2,6 @@ This module holds simple classes to convert geospatial values from the database. """ -from __future__ import unicode_literals - from decimal import Decimal from django.contrib.gis.db.models.fields import GeoSelectFormatMixin diff --git a/django/contrib/gis/feeds.py b/django/contrib/gis/feeds.py index 1e12b4d64c..4240968f19 100644 --- a/django/contrib/gis/feeds.py +++ b/django/contrib/gis/feeds.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.syndication.views import Feed as BaseFeed from django.utils.feedgenerator import Atom1Feed, Rss201rev2Feed diff --git a/django/contrib/gis/forms/fields.py b/django/contrib/gis/forms/fields.py index 4ae56de88b..ef0f4a9bee 100644 --- a/django/contrib/gis/forms/fields.py +++ b/django/contrib/gis/forms/fields.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import forms from django.contrib.gis.geos import GEOSException, GEOSGeometry from django.utils.translation import ugettext_lazy as _ diff --git a/django/contrib/gis/forms/widgets.py b/django/contrib/gis/forms/widgets.py index e331e1844d..2e7e530cc2 100644 --- a/django/contrib/gis/forms/widgets.py +++ b/django/contrib/gis/forms/widgets.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging from django.conf import settings diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py index 7d7292b7b8..79a73b5d88 100644 --- a/django/contrib/gis/gdal/libgdal.py +++ b/django/contrib/gis/gdal/libgdal.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging import os import re diff --git a/django/contrib/gis/geos/geometry.py b/django/contrib/gis/geos/geometry.py index cf5886dc07..deadbfaaf2 100644 --- a/django/contrib/gis/geos/geometry.py +++ b/django/contrib/gis/geos/geometry.py @@ -2,8 +2,6 @@ This module contains the 'base' GEOSGeometry object -- all GEOS Geometries inherit from this object. """ -from __future__ import unicode_literals - import json from ctypes import addressof, byref, c_double diff --git a/django/contrib/gis/serializers/geojson.py b/django/contrib/gis/serializers/geojson.py index dcdf153c36..1b50ee30d8 100644 --- a/django/contrib/gis/serializers/geojson.py +++ b/django/contrib/gis/serializers/geojson.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.gis.gdal import HAS_GDAL from django.core.serializers.base import SerializerDoesNotExist from django.core.serializers.json import Serializer as JSONSerializer diff --git a/django/contrib/gis/sitemaps/views.py b/django/contrib/gis/sitemaps/views.py index 948c3ec36c..add4652373 100644 --- a/django/contrib/gis/sitemaps/views.py +++ b/django/contrib/gis/sitemaps/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.apps import apps from django.contrib.gis.db.models.fields import GeometryField from django.contrib.gis.db.models.functions import AsKML, Transform diff --git a/django/contrib/gis/views.py b/django/contrib/gis/views.py index 5d05d3a057..db0fa3d53d 100644 --- a/django/contrib/gis/views.py +++ b/django/contrib/gis/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.http import Http404 from django.utils.translation import ugettext as _ diff --git a/django/contrib/humanize/templatetags/humanize.py b/django/contrib/humanize/templatetags/humanize.py index d7d8f2f897..5ba9897018 100644 --- a/django/contrib/humanize/templatetags/humanize.py +++ b/django/contrib/humanize/templatetags/humanize.py @@ -1,6 +1,3 @@ -# -*- encoding: utf-8 -*- -from __future__ import unicode_literals - import re from datetime import date, datetime from decimal import Decimal diff --git a/django/contrib/messages/storage/base.py b/django/contrib/messages/storage/base.py index a2e54486c7..2273e97207 100644 --- a/django/contrib/messages/storage/base.py +++ b/django/contrib/messages/storage/base.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf import settings from django.contrib.messages import constants, utils from django.utils.encoding import force_text, python_2_unicode_compatible diff --git a/django/contrib/postgres/indexes.py b/django/contrib/postgres/indexes.py index 185ea7435c..2edec371f4 100644 --- a/django/contrib/postgres/indexes.py +++ b/django/contrib/postgres/indexes.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db.models import Index __all__ = ['BrinIndex', 'GinIndex'] diff --git a/django/contrib/postgres/utils.py b/django/contrib/postgres/utils.py index a2bbb72f36..a87d519477 100644 --- a/django/contrib/postgres/utils.py +++ b/django/contrib/postgres/utils.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.exceptions import ValidationError from django.utils.functional import SimpleLazyObject from django.utils.text import format_lazy diff --git a/django/contrib/redirects/middleware.py b/django/contrib/redirects/middleware.py index f5c9f85588..317dca3fd2 100644 --- a/django/contrib/redirects/middleware.py +++ b/django/contrib/redirects/middleware.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import http from django.apps import apps from django.conf import settings diff --git a/django/contrib/redirects/migrations/0001_initial.py b/django/contrib/redirects/migrations/0001_initial.py index 905ec266aa..fb0462f52c 100644 --- a/django/contrib/redirects/migrations/0001_initial.py +++ b/django/contrib/redirects/migrations/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/django/contrib/sessions/backends/base.py b/django/contrib/sessions/backends/base.py index 40c557ba0b..615eea45d2 100644 --- a/django/contrib/sessions/backends/base.py +++ b/django/contrib/sessions/backends/base.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import base64 import logging import string diff --git a/django/contrib/sessions/base_session.py b/django/contrib/sessions/base_session.py index 5fed0cd2d1..bd8e957aea 100644 --- a/django/contrib/sessions/base_session.py +++ b/django/contrib/sessions/base_session.py @@ -2,8 +2,6 @@ This module allows importing AbstractBaseSession even when django.contrib.sessions is not in INSTALLED_APPS. """ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ diff --git a/django/contrib/sessions/migrations/0001_initial.py b/django/contrib/sessions/migrations/0001_initial.py index e9fd627b79..39eaa6db41 100644 --- a/django/contrib/sessions/migrations/0001_initial.py +++ b/django/contrib/sessions/migrations/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import django.contrib.sessions.models from django.db import migrations, models diff --git a/django/contrib/sessions/models.py b/django/contrib/sessions/models.py index 3ee3ce73d3..a744267927 100644 --- a/django/contrib/sessions/models.py +++ b/django/contrib/sessions/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.sessions.base_session import ( AbstractBaseSession, BaseSessionManager, ) diff --git a/django/contrib/sites/managers.py b/django/contrib/sites/managers.py index a3a0f07fc3..52f91a51ea 100644 --- a/django/contrib/sites/managers.py +++ b/django/contrib/sites/managers.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.conf import settings from django.core import checks from django.core.exceptions import FieldDoesNotExist diff --git a/django/contrib/sites/migrations/0001_initial.py b/django/contrib/sites/migrations/0001_initial.py index b1803682ae..a7639869fc 100644 --- a/django/contrib/sites/migrations/0001_initial.py +++ b/django/contrib/sites/migrations/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import django.contrib.sites.models from django.contrib.sites.models import _simple_domain_name_validator from django.db import migrations, models diff --git a/django/contrib/sites/migrations/0002_alter_domain_unique.py b/django/contrib/sites/migrations/0002_alter_domain_unique.py index 468718cde3..6a26ebcde6 100644 --- a/django/contrib/sites/migrations/0002_alter_domain_unique.py +++ b/django/contrib/sites/migrations/0002_alter_domain_unique.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import django.contrib.sites.models from django.db import migrations, models diff --git a/django/contrib/sites/models.py b/django/contrib/sites/models.py index 7b237b0873..9f849fa559 100644 --- a/django/contrib/sites/models.py +++ b/django/contrib/sites/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import string from django.core.exceptions import ImproperlyConfigured, ValidationError diff --git a/django/contrib/sites/requests.py b/django/contrib/sites/requests.py index 233d840945..81f2ba42d6 100644 --- a/django/contrib/sites/requests.py +++ b/django/contrib/sites/requests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.utils.encoding import python_2_unicode_compatible diff --git a/django/contrib/sites/shortcuts.py b/django/contrib/sites/shortcuts.py index 12471dc9a5..7991c61828 100644 --- a/django/contrib/sites/shortcuts.py +++ b/django/contrib/sites/shortcuts.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.apps import apps diff --git a/django/contrib/staticfiles/management/commands/collectstatic.py b/django/contrib/staticfiles/management/commands/collectstatic.py index 801113e3c4..fac96e5bf4 100644 --- a/django/contrib/staticfiles/management/commands/collectstatic.py +++ b/django/contrib/staticfiles/management/commands/collectstatic.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os from collections import OrderedDict diff --git a/django/contrib/staticfiles/management/commands/findstatic.py b/django/contrib/staticfiles/management/commands/findstatic.py index b594ebcab2..992dae1769 100644 --- a/django/contrib/staticfiles/management/commands/findstatic.py +++ b/django/contrib/staticfiles/management/commands/findstatic.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os from django.contrib.staticfiles import finders diff --git a/django/contrib/staticfiles/storage.py b/django/contrib/staticfiles/storage.py index da0d2004e6..b033243ecc 100644 --- a/django/contrib/staticfiles/storage.py +++ b/django/contrib/staticfiles/storage.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import hashlib import json import os diff --git a/django/contrib/syndication/views.py b/django/contrib/syndication/views.py index 1e3c08d313..fa9c5e7753 100644 --- a/django/contrib/syndication/views.py +++ b/django/contrib/syndication/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from calendar import timegm from django.conf import settings diff --git a/django/core/cache/backends/base.py b/django/core/cache/backends/base.py index 9cbfe0be1d..856316b400 100644 --- a/django/core/cache/backends/base.py +++ b/django/core/cache/backends/base.py @@ -1,6 +1,4 @@ "Base Cache class." -from __future__ import unicode_literals - import time import warnings diff --git a/django/core/cache/utils.py b/django/core/cache/utils.py index c40e4eba0c..84676b9237 100644 --- a/django/core/cache/utils.py +++ b/django/core/cache/utils.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import hashlib from django.utils.encoding import force_bytes diff --git a/django/core/checks/__init__.py b/django/core/checks/__init__.py index f2194a3fc9..8ef3f5db90 100644 --- a/django/core/checks/__init__.py +++ b/django/core/checks/__init__.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from .messages import ( CRITICAL, DEBUG, ERROR, INFO, WARNING, CheckMessage, Critical, Debug, Error, Info, Warning, diff --git a/django/core/checks/caches.py b/django/core/checks/caches.py index 4a4141777d..0994a5b0e8 100644 --- a/django/core/checks/caches.py +++ b/django/core/checks/caches.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf import settings from django.core.cache import DEFAULT_CACHE_ALIAS diff --git a/django/core/checks/messages.py b/django/core/checks/messages.py index 345ebec1e1..f1de41a63c 100644 --- a/django/core/checks/messages.py +++ b/django/core/checks/messages.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.utils.encoding import force_str, python_2_unicode_compatible # Levels diff --git a/django/core/checks/model_checks.py b/django/core/checks/model_checks.py index 0c12f9b96a..a8b5652662 100644 --- a/django/core/checks/model_checks.py +++ b/django/core/checks/model_checks.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import inspect import types from itertools import chain diff --git a/django/core/checks/registry.py b/django/core/checks/registry.py index 292e0cb73b..4a2b358dc8 100644 --- a/django/core/checks/registry.py +++ b/django/core/checks/registry.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from itertools import chain from django.utils.itercompat import is_iterable diff --git a/django/core/checks/templates.py b/django/core/checks/templates.py index 098371740e..bf526c871e 100644 --- a/django/core/checks/templates.py +++ b/django/core/checks/templates.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import copy from django.conf import settings diff --git a/django/core/checks/urls.py b/django/core/checks/urls.py index e950cb5637..d721bc901f 100644 --- a/django/core/checks/urls.py +++ b/django/core/checks/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from collections import Counter from django.conf import settings diff --git a/django/core/files/base.py b/django/core/files/base.py index be889c9bc4..7499629459 100644 --- a/django/core/files/base.py +++ b/django/core/files/base.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os from io import BytesIO, StringIO, UnsupportedOperation diff --git a/django/core/files/uploadhandler.py b/django/core/files/uploadhandler.py index 05b431d05a..748477c0fc 100644 --- a/django/core/files/uploadhandler.py +++ b/django/core/files/uploadhandler.py @@ -2,8 +2,6 @@ Base file upload handler classes, and the built-in concrete subclasses """ -from __future__ import unicode_literals - from io import BytesIO from django.conf import settings diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py index 1d53fa9d94..b37716b62c 100644 --- a/django/core/handlers/base.py +++ b/django/core/handlers/base.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging import types diff --git a/django/core/handlers/exception.py b/django/core/handlers/exception.py index ab859405f3..5e489f64d3 100644 --- a/django/core/handlers/exception.py +++ b/django/core/handlers/exception.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging import sys from functools import wraps diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py index 4486754d41..538373cd8d 100644 --- a/django/core/handlers/wsgi.py +++ b/django/core/handlers/wsgi.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import cgi import codecs import re diff --git a/django/core/mail/__init__.py b/django/core/mail/__init__.py index 5741f8a829..23beae0cce 100644 --- a/django/core/mail/__init__.py +++ b/django/core/mail/__init__.py @@ -1,8 +1,6 @@ """ Tools for sending email. """ -from __future__ import unicode_literals - from django.conf import settings # Imported for backwards compatibility and for the sake # of a cleaner namespace. These symbols used to be in diff --git a/django/core/mail/message.py b/django/core/mail/message.py index 3cebbaf9d2..2c68e82809 100644 --- a/django/core/mail/message.py +++ b/django/core/mail/message.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import mimetypes import os import random diff --git a/django/core/management/__init__.py b/django/core/management/__init__.py index fdc1af2aa2..6b89fff351 100644 --- a/django/core/management/__init__.py +++ b/django/core/management/__init__.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import pkgutil import sys diff --git a/django/core/management/base.py b/django/core/management/base.py index cdc673a479..192d529ef0 100644 --- a/django/core/management/base.py +++ b/django/core/management/base.py @@ -1,10 +1,7 @@ -# -*- coding: utf-8 -*- """ Base classes for writing management commands (named commands which can be executed through ``django-admin`` or ``manage.py``). """ -from __future__ import unicode_literals - import os import sys from argparse import ArgumentParser diff --git a/django/core/management/commands/check.py b/django/core/management/commands/check.py index aa9685caa9..e119960f44 100644 --- a/django/core/management/commands/check.py +++ b/django/core/management/commands/check.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.apps import apps from django.core import checks from django.core.checks.registry import registry diff --git a/django/core/management/commands/compilemessages.py b/django/core/management/commands/compilemessages.py index 874fea4b5a..05fb9e5cfc 100644 --- a/django/core/management/commands/compilemessages.py +++ b/django/core/management/commands/compilemessages.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import codecs import glob import os diff --git a/django/core/management/commands/flush.py b/django/core/management/commands/flush.py index 68226355b8..dbe870f322 100644 --- a/django/core/management/commands/flush.py +++ b/django/core/management/commands/flush.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import sys from importlib import import_module diff --git a/django/core/management/commands/inspectdb.py b/django/core/management/commands/inspectdb.py index 69721b1283..09939f28da 100644 --- a/django/core/management/commands/inspectdb.py +++ b/django/core/management/commands/inspectdb.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import keyword import re from collections import OrderedDict @@ -56,8 +54,6 @@ class Command(BaseCommand): "Django to create, modify, and delete the table" ) yield "# Feel free to rename the models, but don't rename db_table values or field names." - yield "from __future__ import unicode_literals" - yield '' yield 'from %s import models' % self.db_module known_models = [] tables_to_introspect = options['table'] or connection.introspection.table_names(cursor) diff --git a/django/core/management/commands/loaddata.py b/django/core/management/commands/loaddata.py index d824011a03..4b621205e6 100644 --- a/django/core/management/commands/loaddata.py +++ b/django/core/management/commands/loaddata.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import glob import gzip import os diff --git a/django/core/management/commands/makemessages.py b/django/core/management/commands/makemessages.py index 527472e1c9..1597f9347e 100644 --- a/django/core/management/commands/makemessages.py +++ b/django/core/management/commands/makemessages.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import fnmatch import glob import io diff --git a/django/core/management/commands/migrate.py b/django/core/management/commands/migrate.py index ea9e7cd46b..79ff872db0 100644 --- a/django/core/management/commands/migrate.py +++ b/django/core/management/commands/migrate.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import time from collections import OrderedDict from importlib import import_module diff --git a/django/core/management/commands/runserver.py b/django/core/management/commands/runserver.py index 0bfbd5b68e..62370072c5 100644 --- a/django/core/management/commands/runserver.py +++ b/django/core/management/commands/runserver.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import errno import os import re diff --git a/django/core/management/commands/showmigrations.py b/django/core/management/commands/showmigrations.py index 890839b150..1e20ec1745 100644 --- a/django/core/management/commands/showmigrations.py +++ b/django/core/management/commands/showmigrations.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.core.management.base import BaseCommand, CommandError from django.db import DEFAULT_DB_ALIAS, connections from django.db.migrations.loader import MigrationLoader diff --git a/django/core/management/commands/sqlflush.py b/django/core/management/commands/sqlflush.py index f0c7e30270..da7d6b00e9 100644 --- a/django/core/management/commands/sqlflush.py +++ b/django/core/management/commands/sqlflush.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.management.base import BaseCommand from django.core.management.sql import sql_flush from django.db import DEFAULT_DB_ALIAS, connections diff --git a/django/core/management/commands/sqlmigrate.py b/django/core/management/commands/sqlmigrate.py index 5047d900c1..f6c67a5807 100644 --- a/django/core/management/commands/sqlmigrate.py +++ b/django/core/management/commands/sqlmigrate.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.core.management.base import BaseCommand, CommandError from django.db import DEFAULT_DB_ALIAS, connections from django.db.migrations.executor import MigrationExecutor diff --git a/django/core/management/commands/sqlsequencereset.py b/django/core/management/commands/sqlsequencereset.py index 6ac6e10d60..788a923c72 100644 --- a/django/core/management/commands/sqlsequencereset.py +++ b/django/core/management/commands/sqlsequencereset.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.management.base import AppCommand from django.db import DEFAULT_DB_ALIAS, connections diff --git a/django/core/management/sql.py b/django/core/management/sql.py index c72519f30a..3783025900 100644 --- a/django/core/management/sql.py +++ b/django/core/management/sql.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.apps import apps from django.db import models diff --git a/django/core/management/templates.py b/django/core/management/templates.py index ee6e284a63..805da99148 100644 --- a/django/core/management/templates.py +++ b/django/core/management/templates.py @@ -113,8 +113,6 @@ class TemplateCommand(BaseCommand): camel_case_name: camel_case_value, 'docs_version': get_docs_version(), 'django_version': django.__version__, - 'unicode_literals': '' if six.PY3 else '# -*- coding: utf-8 -*-\n' - 'from __future__ import unicode_literals\n\n', }), autoescape=False) # Setup a stub settings environment for template rendering diff --git a/django/core/management/utils.py b/django/core/management/utils.py index 7ea005a6f0..0fb8b0d25f 100644 --- a/django/core/management/utils.py +++ b/django/core/management/utils.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import sys from subprocess import PIPE, Popen diff --git a/django/core/serializers/json.py b/django/core/serializers/json.py index 9da8993ee6..b335605785 100644 --- a/django/core/serializers/json.py +++ b/django/core/serializers/json.py @@ -2,9 +2,6 @@ Serialize data to/from JSON """ -# Avoid shadowing the standard library json module -from __future__ import absolute_import, unicode_literals - import datetime import decimal import json diff --git a/django/core/serializers/python.py b/django/core/serializers/python.py index 7a61999f15..a0cea14297 100644 --- a/django/core/serializers/python.py +++ b/django/core/serializers/python.py @@ -3,8 +3,6 @@ A Python "serializer". Doesn't do much serializing per se -- just converts to and from basic Python data types (lists, dicts, strings, etc.). Useful as a basis for other serializers. """ -from __future__ import unicode_literals - from collections import OrderedDict from django.apps import apps diff --git a/django/core/serializers/xml_serializer.py b/django/core/serializers/xml_serializer.py index 5e151108fc..e209cb286a 100644 --- a/django/core/serializers/xml_serializer.py +++ b/django/core/serializers/xml_serializer.py @@ -2,8 +2,6 @@ XML serializer. """ -from __future__ import unicode_literals - from collections import OrderedDict from xml.dom import pulldom from xml.sax import handler diff --git a/django/core/servers/basehttp.py b/django/core/servers/basehttp.py index 3928d8c3ff..e27378e7a5 100644 --- a/django/core/servers/basehttp.py +++ b/django/core/servers/basehttp.py @@ -7,8 +7,6 @@ This is a simple server for use in testing or debugging Django apps. It hasn't been reviewed for security issues. DON'T USE IT FOR PRODUCTION USE! """ -from __future__ import unicode_literals - import logging import socket import sys diff --git a/django/core/signing.py b/django/core/signing.py index 22b438315b..f578da6f99 100644 --- a/django/core/signing.py +++ b/django/core/signing.py @@ -33,8 +33,6 @@ There are 65 url-safe characters: the 64 used by url-safe base64 and the ':'. These functions make use of all of them. """ -from __future__ import unicode_literals - import base64 import datetime import json diff --git a/django/core/validators.py b/django/core/validators.py index 3f777254f4..221f3e0934 100644 --- a/django/core/validators.py +++ b/django/core/validators.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import re diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py index a2416c82cd..3d6cb71915 100644 --- a/django/db/backends/mysql/base.py +++ b/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 diff --git a/django/db/backends/mysql/operations.py b/django/db/backends/mysql/operations.py index 6a55d7a88f..4edc9272a9 100644 --- a/django/db/backends/mysql/operations.py +++ b/django/db/backends/mysql/operations.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import uuid from django.conf import settings diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py index cf17f9fa6c..317599253d 100644 --- a/django/db/backends/oracle/base.py +++ b/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 diff --git a/django/db/backends/oracle/operations.py b/django/db/backends/oracle/operations.py index 9c382895b7..fd9d2d1179 100644 --- a/django/db/backends/oracle/operations.py +++ b/django/db/backends/oracle/operations.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import re import uuid diff --git a/django/db/backends/postgresql/introspection.py b/django/db/backends/postgresql/introspection.py index e9d7d0225f..34150c6f48 100644 --- a/django/db/backends/postgresql/introspection.py +++ b/django/db/backends/postgresql/introspection.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import warnings from django.db.backends.base.introspection import ( diff --git a/django/db/backends/postgresql/operations.py b/django/db/backends/postgresql/operations.py index 20f60ab5ae..542fe223cb 100644 --- a/django/db/backends/postgresql/operations.py +++ b/django/db/backends/postgresql/operations.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from psycopg2.extras import Inet from django.conf import settings diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py index 252293d9cc..0cd0516a0a 100644 --- a/django/db/backends/sqlite3/base.py +++ b/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 diff --git a/django/db/backends/sqlite3/features.py b/django/db/backends/sqlite3/features.py index 4f8d3d5742..43a29b78f5 100644 --- a/django/db/backends/sqlite3/features.py +++ b/django/db/backends/sqlite3/features.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import utils from django.db.backends.base.features import BaseDatabaseFeatures from django.utils import six diff --git a/django/db/backends/sqlite3/operations.py b/django/db/backends/sqlite3/operations.py index 1ab20767c4..529db94451 100644 --- a/django/db/backends/sqlite3/operations.py +++ b/django/db/backends/sqlite3/operations.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import uuid diff --git a/django/db/backends/utils.py b/django/db/backends/utils.py index 73f1dbb690..b72840e989 100644 --- a/django/db/backends/utils.py +++ b/django/db/backends/utils.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import decimal import hashlib diff --git a/django/db/migrations/autodetector.py b/django/db/migrations/autodetector.py index b2ee53917f..84ecf90b9e 100644 --- a/django/db/migrations/autodetector.py +++ b/django/db/migrations/autodetector.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import functools import re from itertools import chain diff --git a/django/db/migrations/exceptions.py b/django/db/migrations/exceptions.py index 7b10bd0394..d3da26940f 100644 --- a/django/db/migrations/exceptions.py +++ b/django/db/migrations/exceptions.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db.utils import DatabaseError from django.utils.encoding import python_2_unicode_compatible diff --git a/django/db/migrations/executor.py b/django/db/migrations/executor.py index 1a0b6f6322..a590a0aca3 100644 --- a/django/db/migrations/executor.py +++ b/django/db/migrations/executor.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.apps.registry import apps as global_apps from django.db import migrations, router diff --git a/django/db/migrations/graph.py b/django/db/migrations/graph.py index 1a7a70322f..83422361c4 100644 --- a/django/db/migrations/graph.py +++ b/django/db/migrations/graph.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import sys import warnings from collections import deque diff --git a/django/db/migrations/loader.py b/django/db/migrations/loader.py index bbbde07a98..8a42d96e9a 100644 --- a/django/db/migrations/loader.py +++ b/django/db/migrations/loader.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import sys from importlib import import_module diff --git a/django/db/migrations/migration.py b/django/db/migrations/migration.py index 732dcb82e8..d8b993f725 100644 --- a/django/db/migrations/migration.py +++ b/django/db/migrations/migration.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db.transaction import atomic from django.utils.encoding import python_2_unicode_compatible diff --git a/django/db/migrations/operations/base.py b/django/db/migrations/operations/base.py index 95829f716a..f5acf9f3a8 100644 --- a/django/db/migrations/operations/base.py +++ b/django/db/migrations/operations/base.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import router diff --git a/django/db/migrations/operations/fields.py b/django/db/migrations/operations/fields.py index 4ce465a0c3..431f87d7e6 100644 --- a/django/db/migrations/operations/fields.py +++ b/django/db/migrations/operations/fields.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db.models.fields import NOT_PROVIDED from django.utils.functional import cached_property diff --git a/django/db/migrations/operations/models.py b/django/db/migrations/operations/models.py index 16cadc7a2f..783cfcc519 100644 --- a/django/db/migrations/operations/models.py +++ b/django/db/migrations/operations/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import models from django.db.migrations.operations.base import Operation from django.db.migrations.state import ModelState diff --git a/django/db/migrations/operations/special.py b/django/db/migrations/operations/special.py index 66c5a3af27..706e691352 100644 --- a/django/db/migrations/operations/special.py +++ b/django/db/migrations/operations/special.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import router from .base import Operation diff --git a/django/db/migrations/optimizer.py b/django/db/migrations/optimizer.py index f1d51c75ba..ca7f9db600 100644 --- a/django/db/migrations/optimizer.py +++ b/django/db/migrations/optimizer.py @@ -1,6 +1,3 @@ -from __future__ import unicode_literals - - class MigrationOptimizer(object): """ Powers the optimization process, where you provide a list of Operations diff --git a/django/db/migrations/questioner.py b/django/db/migrations/questioner.py index df08508a10..d508ee9b78 100644 --- a/django/db/migrations/questioner.py +++ b/django/db/migrations/questioner.py @@ -1,5 +1,3 @@ -from __future__ import print_function, unicode_literals - import importlib import os import sys diff --git a/django/db/migrations/recorder.py b/django/db/migrations/recorder.py index 2dcbe6c042..0dac81223d 100644 --- a/django/db/migrations/recorder.py +++ b/django/db/migrations/recorder.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.apps.registry import Apps from django.db import models from django.db.utils import DatabaseError diff --git a/django/db/migrations/serializer.py b/django/db/migrations/serializer.py index 8f32fb986b..b273097da4 100644 --- a/django/db/migrations/serializer.py +++ b/django/db/migrations/serializer.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import collections import datetime import decimal diff --git a/django/db/migrations/state.py b/django/db/migrations/state.py index 98724337d8..c88663ff3a 100644 --- a/django/db/migrations/state.py +++ b/django/db/migrations/state.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import copy from collections import OrderedDict from contextlib import contextmanager diff --git a/django/db/migrations/writer.py b/django/db/migrations/writer.py index df70f61eae..ae51a1f0d9 100644 --- a/django/db/migrations/writer.py +++ b/django/db/migrations/writer.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os import re from importlib import import_module @@ -294,9 +292,7 @@ class MigrationWriter(object): MIGRATION_TEMPLATE = """\ -# -*- coding: utf-8 -*- # Generated by Django %(version)s on %(timestamp)s -from __future__ import unicode_literals %(imports)s diff --git a/django/db/models/base.py b/django/db/models/base.py index 7ecfc06284..2fbcf46a41 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import copy import inspect import warnings diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index cf3aab4815..ddfcbb4f39 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import collections import copy import datetime diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index 256441c6a2..aec362e84a 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import inspect from functools import partial diff --git a/django/db/models/fields/related_descriptors.py b/django/db/models/fields/related_descriptors.py index d8d57a89ed..696dc6f749 100644 --- a/django/db/models/fields/related_descriptors.py +++ b/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 diff --git a/django/db/models/fields/reverse_related.py b/django/db/models/fields/reverse_related.py index 82d9af64e7..1b706ba6ea 100644 --- a/django/db/models/fields/reverse_related.py +++ b/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 diff --git a/django/db/models/functions/datetime.py b/django/db/models/functions/datetime.py index 7b137eabef..269b829e43 100644 --- a/django/db/models/functions/datetime.py +++ b/django/db/models/functions/datetime.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - from datetime import datetime from django.conf import settings diff --git a/django/db/models/indexes.py b/django/db/models/indexes.py index 5922131292..c296f22163 100644 --- a/django/db/models/indexes.py +++ b/django/db/models/indexes.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import hashlib from django.utils.encoding import force_bytes diff --git a/django/db/models/options.py b/django/db/models/options.py index 19a0de8dfd..943de0dd91 100644 --- a/django/db/models/options.py +++ b/django/db/models/options.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import copy import warnings from bisect import bisect diff --git a/django/db/models/query_utils.py b/django/db/models/query_utils.py index fa245fcf07..112c9586d0 100644 --- a/django/db/models/query_utils.py +++ b/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 diff --git a/django/forms/boundfield.py b/django/forms/boundfield.py index a1063b2b05..fa141b35ef 100644 --- a/django/forms/boundfield.py +++ b/django/forms/boundfield.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import warnings diff --git a/django/forms/fields.py b/django/forms/fields.py index 74cc3a6552..65824fbd97 100644 --- a/django/forms/fields.py +++ b/django/forms/fields.py @@ -2,8 +2,6 @@ Field classes. """ -from __future__ import unicode_literals - import copy import datetime import itertools diff --git a/django/forms/forms.py b/django/forms/forms.py index 8044349517..0f1fbef6c8 100644 --- a/django/forms/forms.py +++ b/django/forms/forms.py @@ -2,8 +2,6 @@ Form classes """ -from __future__ import unicode_literals - import copy from collections import OrderedDict diff --git a/django/forms/formsets.py b/django/forms/formsets.py index 7d9e84113f..1e5ec8ee6b 100644 --- a/django/forms/formsets.py +++ b/django/forms/formsets.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.exceptions import ValidationError from django.forms import Form from django.forms.fields import BooleanField, IntegerField diff --git a/django/forms/models.py b/django/forms/models.py index a0f3ff53b3..38f6812ba0 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -3,8 +3,6 @@ Helper functions for creating Form classes from Django models and database field objects. """ -from __future__ import unicode_literals - from collections import OrderedDict from itertools import chain diff --git a/django/forms/utils.py b/django/forms/utils.py index 88086b2c64..3e6991ea32 100644 --- a/django/forms/utils.py +++ b/django/forms/utils.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import json import sys diff --git a/django/forms/widgets.py b/django/forms/widgets.py index 71f408e783..3ddad40ebb 100644 --- a/django/forms/widgets.py +++ b/django/forms/widgets.py @@ -2,8 +2,6 @@ HTML Widget classes """ -from __future__ import unicode_literals - import copy import datetime import re diff --git a/django/http/cookie.py b/django/http/cookie.py index 1f10eff95a..49048787eb 100644 --- a/django/http/cookie.py +++ b/django/http/cookie.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import sys from django.utils import six diff --git a/django/http/multipartparser.py b/django/http/multipartparser.py index 616185f021..ecfbdf7252 100644 --- a/django/http/multipartparser.py +++ b/django/http/multipartparser.py @@ -4,8 +4,6 @@ Multi-part parsing for file uploads. Exposes one class, ``MultiPartParser``, which feeds chunks of uploaded data to file upload handlers for processing. """ -from __future__ import unicode_literals - import base64 import binascii import cgi diff --git a/django/http/request.py b/django/http/request.py index 9ffcd23fbd..559081b50c 100644 --- a/django/http/request.py +++ b/django/http/request.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import copy import re import sys diff --git a/django/http/response.py b/django/http/response.py index e9e283e840..597d688602 100644 --- a/django/http/response.py +++ b/django/http/response.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime import json import re diff --git a/django/middleware/csrf.py b/django/middleware/csrf.py index d7359e4912..14d3537f29 100644 --- a/django/middleware/csrf.py +++ b/django/middleware/csrf.py @@ -4,8 +4,6 @@ Cross Site Request Forgery Middleware. This module provides a middleware that implements protection against request forgeries from other sites. """ -from __future__ import unicode_literals - import logging import re import string diff --git a/django/template/backends/base.py b/django/template/backends/base.py index 00b5fc4b2b..9f48fbfdca 100644 --- a/django/template/backends/base.py +++ b/django/template/backends/base.py @@ -1,6 +1,3 @@ -# Since this package contains a "django" module, this is required on Python 2. -from __future__ import absolute_import - from django.core.exceptions import ( ImproperlyConfigured, SuspiciousFileOperation, ) diff --git a/django/template/backends/django.py b/django/template/backends/django.py index afe1a7cd23..7ae8141251 100644 --- a/django/template/backends/django.py +++ b/django/template/backends/django.py @@ -1,6 +1,3 @@ -# Since this package contains a "django" module, this is required on Python 2. -from __future__ import absolute_import - import sys from importlib import import_module from pkgutil import walk_packages diff --git a/django/template/backends/dummy.py b/django/template/backends/dummy.py index 1d6f446dec..015cb8bda0 100644 --- a/django/template/backends/dummy.py +++ b/django/template/backends/dummy.py @@ -1,6 +1,3 @@ -# Since this package contains a "django" module, this is required on Python 2. -from __future__ import absolute_import - import errno import io import string diff --git a/django/template/backends/jinja2.py b/django/template/backends/jinja2.py index cf08858db9..2497df1b84 100644 --- a/django/template/backends/jinja2.py +++ b/django/template/backends/jinja2.py @@ -1,6 +1,3 @@ -# Since this package contains a "django" module, this is required on Python 2. -from __future__ import absolute_import - import sys import jinja2 diff --git a/django/template/backends/utils.py b/django/template/backends/utils.py index 881d83acf2..8147bb4988 100644 --- a/django/template/backends/utils.py +++ b/django/template/backends/utils.py @@ -1,6 +1,3 @@ -# Since this package contains a "django" module, this is required on Python 2. -from __future__ import absolute_import - from django.middleware.csrf import get_token from django.utils.functional import lazy from django.utils.html import format_html diff --git a/django/template/base.py b/django/template/base.py index af3b6c5371..3aa7941879 100644 --- a/django/template/base.py +++ b/django/template/base.py @@ -49,8 +49,6 @@ times with multiple contexts) '' """ -from __future__ import unicode_literals - import inspect import logging import re diff --git a/django/template/context_processors.py b/django/template/context_processors.py index da5276ce44..85cd3eaa5f 100644 --- a/django/template/context_processors.py +++ b/django/template/context_processors.py @@ -7,8 +7,6 @@ These are referenced from the 'context_processors' option of the configuration of a DjangoTemplates backend and used by RequestContext. """ -from __future__ import unicode_literals - import itertools from django.conf import settings diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py index e35415bdf7..fc249953ea 100644 --- a/django/template/defaultfilters.py +++ b/django/template/defaultfilters.py @@ -1,6 +1,4 @@ """Default variable filters.""" -from __future__ import unicode_literals - import random as random_module import re from decimal import ROUND_HALF_UP, Context, Decimal, InvalidOperation diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py index d35e80cfa9..2c455aff7b 100644 --- a/django/template/defaulttags.py +++ b/django/template/defaulttags.py @@ -1,6 +1,4 @@ """Default tags used by the template system, available to all templates.""" -from __future__ import unicode_literals - import re import sys import warnings diff --git a/django/templatetags/cache.py b/django/templatetags/cache.py index 1b49bca1b6..3af6dc4df6 100644 --- a/django/templatetags/cache.py +++ b/django/templatetags/cache.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.cache import InvalidCacheBackendError, caches from django.core.cache.utils import make_template_fragment_key from django.template import ( diff --git a/django/templatetags/i18n.py b/django/templatetags/i18n.py index 0c4f03e948..4a32e628c2 100644 --- a/django/templatetags/i18n.py +++ b/django/templatetags/i18n.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import sys from django.conf import settings diff --git a/django/test/client.py b/django/test/client.py index 05d3d78603..7365b1d2aa 100644 --- a/django/test/client.py +++ b/django/test/client.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import json import mimetypes import os diff --git a/django/test/html.py b/django/test/html.py index dfff8d6369..94dc7f540e 100644 --- a/django/test/html.py +++ b/django/test/html.py @@ -2,8 +2,6 @@ Comparing two html documents. """ -from __future__ import unicode_literals - import re from django.utils import six diff --git a/django/test/selenium.py b/django/test/selenium.py index ae8e603a58..de3744c91e 100644 --- a/django/test/selenium.py +++ b/django/test/selenium.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import sys import unittest from contextlib import contextmanager diff --git a/django/test/testcases.py b/django/test/testcases.py index e342ac282d..88d355311d 100644 --- a/django/test/testcases.py +++ b/django/test/testcases.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import difflib import json import posixpath diff --git a/django/urls/base.py b/django/urls/base.py index ddf3b64dab..8e30acb860 100644 --- a/django/urls/base.py +++ b/django/urls/base.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from threading import local from django.utils import six diff --git a/django/urls/exceptions.py b/django/urls/exceptions.py index 14967f7eb4..87bf5284f7 100644 --- a/django/urls/exceptions.py +++ b/django/urls/exceptions.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.http import Http404 diff --git a/django/urls/resolvers.py b/django/urls/resolvers.py index 1de59a8763..4a66895de5 100644 --- a/django/urls/resolvers.py +++ b/django/urls/resolvers.py @@ -5,8 +5,6 @@ RegexURLResolver is the main class here. Its resolve() method takes a URL (as a string) and returns a ResolverMatch object which provides access to all attributes of the resolved URL match. """ -from __future__ import unicode_literals - import functools import re import threading diff --git a/django/urls/utils.py b/django/urls/utils.py index 1901c0a494..8558b82bba 100644 --- a/django/urls/utils.py +++ b/django/urls/utils.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from importlib import import_module from django.core.exceptions import ViewDoesNotExist diff --git a/django/utils/_os.py b/django/utils/_os.py 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 diff --git a/django/views/debug.py b/django/views/debug.py index 0fb5ab1a2d..7c33aa8eca 100644 --- a/django/views/debug.py +++ b/django/views/debug.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import re import sys import types diff --git a/django/views/generic/base.py b/django/views/generic/base.py index fc04bcc311..4187e70b12 100644 --- a/django/views/generic/base.py +++ b/django/views/generic/base.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging from functools import update_wrapper diff --git a/django/views/generic/dates.py b/django/views/generic/dates.py index 938c538535..d03140a973 100644 --- a/django/views/generic/dates.py +++ b/django/views/generic/dates.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import datetime from django.conf import settings diff --git a/django/views/generic/detail.py b/django/views/generic/detail.py index 2b67ef5e5c..b84585804b 100644 --- a/django/views/generic/detail.py +++ b/django/views/generic/detail.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.exceptions import ImproperlyConfigured from django.db import models from django.http import Http404 diff --git a/django/views/generic/list.py b/django/views/generic/list.py index 2277ffd4d3..951c11f5a5 100644 --- a/django/views/generic/list.py +++ b/django/views/generic/list.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.exceptions import ImproperlyConfigured from django.core.paginator import InvalidPage, Paginator from django.db.models.query import QuerySet diff --git a/django/views/static.py b/django/views/static.py index 2af26621f3..bfa171357d 100644 --- a/django/views/static.py +++ b/django/views/static.py @@ -2,8 +2,6 @@ Views and functions for serving static files. These are only to be used during development, and SHOULD NOT be used in a production setting. """ -from __future__ import unicode_literals - import mimetypes import os import posixpath diff --git a/docs/conf.py b/docs/conf.py index 1643559a1d..13a6dbd67e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# # Django documentation build configuration file, created by # sphinx-quickstart on Thu Mar 27 09:06:53 2008. # @@ -11,8 +9,6 @@ # All configuration values have a default; values that are commented out # serve to show the default. -from __future__ import unicode_literals - import sys from os.path import abspath, dirname, join diff --git a/docs/howto/writing-migrations.txt b/docs/howto/writing-migrations.txt index 35964f7ce8..02579eeeb4 100644 --- a/docs/howto/writing-migrations.txt +++ b/docs/howto/writing-migrations.txt @@ -100,10 +100,7 @@ the respective field according to your needs. .. snippet:: :filename: 0006_remove_uuid_null.py - # -*- coding: utf-8 -*- # Generated by Django A.B on YYYY-MM-DD HH:MM - from __future__ import unicode_literals - from django.db import migrations, models import uuid @@ -154,10 +151,7 @@ the respective field according to your needs. .. snippet:: :filename: 0005_populate_uuid_values.py - # -*- coding: utf-8 -*- # Generated by Django A.B on YYYY-MM-DD HH:MM - from __future__ import unicode_literals - from django.db import migrations, models import uuid diff --git a/docs/ref/files/file.txt b/docs/ref/files/file.txt index 6c218e38b3..4169b74b88 100644 --- a/docs/ref/files/file.txt +++ b/docs/ref/files/file.txt @@ -111,7 +111,6 @@ The ``ContentFile`` class but unlike :class:`~django.core.files.File` it operates on string content (bytes also supported), rather than an actual file. For example:: - from __future__ import unicode_literals from django.core.files.base import ContentFile f1 = ContentFile("esta sentencia está en español") diff --git a/docs/ref/migration-operations.txt b/docs/ref/migration-operations.txt index 7e5f4d4784..e6e6f73a99 100644 --- a/docs/ref/migration-operations.txt +++ b/docs/ref/migration-operations.txt @@ -310,9 +310,6 @@ class in the migration file, and just pass it to ``RunPython``. Here's an example of using ``RunPython`` to create some initial objects on a ``Country`` model:: - # -*- coding: utf-8 -*- - from __future__ import unicode_literals - from django.db import migrations, models def forwards_func(apps, schema_editor): diff --git a/docs/topics/i18n/formatting.txt b/docs/topics/i18n/formatting.txt index 248d6b0d23..4a0ce6d3e8 100644 --- a/docs/topics/i18n/formatting.txt +++ b/docs/topics/i18n/formatting.txt @@ -177,8 +177,6 @@ To customize the English formats, a structure like this would be needed:: where :file:`formats.py` contains custom format definitions. For example:: - from __future__ import unicode_literals - THOUSAND_SEPARATOR = '\xa0' to use a non-breaking space (Unicode ``00A0``) as a thousand separator, diff --git a/docs/topics/migrations.txt b/docs/topics/migrations.txt index e8675fe545..5475e7b385 100644 --- a/docs/topics/migrations.txt +++ b/docs/topics/migrations.txt @@ -454,10 +454,7 @@ the file in the right place, suggest a name, and add dependencies for you):: Then, open up the file; it should look something like this:: - # -*- coding: utf-8 -*- # Generated by Django A.B on YYYY-MM-DD HH:MM - from __future__ import unicode_literals - from django.db import migrations, models class Migration(migrations.Migration): @@ -485,9 +482,6 @@ combined values of ``first_name`` and ``last_name`` (we've come to our senses and realized that not everyone has first and last names). All we need to do is use the historical model and iterate over the rows:: - # -*- coding: utf-8 -*- - from __future__ import unicode_literals - from django.db import migrations, models def combine_names(apps, schema_editor): @@ -757,26 +751,6 @@ The decorator adds logic to capture and preserve the arguments on their way into your constructor, and then returns those arguments exactly when deconstruct() is called. -Supporting Python 2 and 3 -========================= - -In order to generate migrations that support both Python 2 and 3, all string -literals used in your models and fields (e.g. ``verbose_name``, -``related_name``, etc.), must be consistently either bytestrings or text -(unicode) strings in both Python 2 and 3 (rather than bytes in Python 2 and -text in Python 3, the default situation for unmarked string literals.) -Otherwise running :djadmin:`makemigrations` under Python 3 will generate -spurious new migrations to convert all these string attributes to text. - -The easiest way to achieve this is to follow the advice in Django's -:doc:`Python 3 porting guide ` and make sure that all your -modules begin with ``from __future__ import unicode_literals``, so that all -unmarked string literals are always unicode, regardless of Python version. When -you add this to an app with existing migrations generated on Python 2, your -next run of :djadmin:`makemigrations` on Python 3 will likely generate many -changes as it converts all the bytestring attributes to text strings; this is -normal and should only happen once. - Supporting multiple Django versions =================================== diff --git a/docs/topics/templates.txt b/docs/topics/templates.txt index a819acf3f0..23d74cbaa3 100644 --- a/docs/topics/templates.txt +++ b/docs/topics/templates.txt @@ -422,8 +422,6 @@ environment. For example, you can create ``myproject/jinja2.py`` with this content:: - from __future__ import absolute_import # Python 2 only - from django.contrib.staticfiles.storage import staticfiles_storage from django.urls import reverse diff --git a/tests/admin_changelist/tests.py b/tests/admin_changelist/tests.py 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