summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2016-07-14 18:24:40 +0200
committerClaude Paroz <claude@2xlibre.net>2016-07-14 20:37:56 +0200
commit3e71f6544feca490211e88db4f449dfdb7acce39 (patch)
tree064e7c6c5628776ed736d3610ce707520f805ec3 /django
parent8ef78b81654ebcf19a1fc241e2b1ede35100096b (diff)
Fixed #26897 -- Fixed makemessages crash on Python 2 with non-ASCII file names
Thanks Tim Graham for the review.
Diffstat (limited to 'django')
-rw-r--r--django/core/management/commands/makemessages.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/core/management/commands/makemessages.py b/django/core/management/commands/makemessages.py
index c0f9d58f9d..8e00c51dc3 100644
--- a/django/core/management/commands/makemessages.py
+++ b/django/core/management/commands/makemessages.py
@@ -549,7 +549,7 @@ class Command(BaseCommand):
input_files = [bf.work_path for bf in build_files]
with NamedTemporaryFile(mode='w+') as input_files_list:
- input_files_list.write('\n'.join(input_files))
+ input_files_list.write(force_str('\n'.join(input_files), encoding=DEFAULT_LOCALE_ENCODING))
input_files_list.flush()
args.extend(['--files-from', input_files_list.name])
args.extend(self.xgettext_options)