Ticket #21046: 21046-1.diff

django/core/management/templates.py

@@ -14 +14 @@
 import django
 from django.template import Template, Context
 from django.utils import archive
+from django.utils import six
 from django.utils.six.moves.urllib.request import urlretrieve
 from django.utils._os import rmtree_errorhandler
 from django.core.management.base import BaseCommand, CommandError
@@ -149 +150 @@
 
                 # Only render the Python files, as we don't want to
                 # accidentally render Django templates files
-                with open(old_path, 'rb') as template_file:
-                    content = template_file.read()
+                render_file = False
                 if filename.endswith(extensions) or filename in extra_files:
-                    content = content.decode('utf-8')
+                    render_file = True
+                with open(old_path, 'r%s' % ('' if render_file else 'b')) as template_file:
+                    content = template_file.read()
+                if render_file:
+                    if six.PY2:
+                        content = content.decode('utf-8')
                     template = Template(content)
                     content = template.render(context)
-                    content = content.encode('utf-8')
-                with open(new_path, 'wb') as new_file:
+                    if six.PY2:
+                        content = content.encode('utf-8')
+                with open(new_path, 'w%s' % ('' if render_file else 'b')) as new_file:
                     new_file.write(content)
 
                 if self.verbosity >= 2: