diff options
| author | Claude Paroz <claude@2xlibre.net> | 2016-11-19 18:19:41 +0100 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2017-01-18 09:55:19 +0100 |
| commit | d7b9aaa366dd54ecc3142c588162e3adc7c2f7ac (patch) | |
| tree | c7faf11a6f6c14981a08a621c36e6f736b21dd8b /django | |
| parent | 397b3705c5f762b359cdb494f9447c8a60685adf (diff) | |
Refs #23919 -- Removed encoding preambles and future imports
Diffstat (limited to 'django')
281 files changed, 5 insertions, 675 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) '<html></html>' """ -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 |