Ticket #24950: 24950.diff

django/conf/app_template/models.py

@@ -1 @@
-from django.db import models
+{{ unicode_literals }}from django.db import models
 
 # Create your models here.

django/core/management/templates.py

@@ -14 +14 @@
 from django.core.management.base import BaseCommand, CommandError
 from django.core.management.utils import handle_extensions
 from django.template import Context, Engine
-from django.utils import archive
+from django.utils import archive, six
 from django.utils.six.moves.urllib.request import urlretrieve
 from django.utils.version import get_docs_version
 
@@ -104 +104 @@
             base_directory: top_dir,
             'docs_version': get_docs_version(),
             'django_version': django.__version__,
+            'unicode_literals': '' if six.PY3 else 'from __future__ import unicode_literals\n\n'
         }), autoescape=False)
 
         # Setup a stub settings environment for template rendering