django · claudep · Jan 18, 2017 · Nov 19, 2016
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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