summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-11-11 11:49:48 +0100
committerClaude Paroz <claude@2xlibre.net>2013-11-11 11:51:38 +0100
commitdffcc5e97988d92b2b8a3bba23a49bcb3cf5d040 (patch)
tree35a62be35a352340ec28a1095e7c04aa0d60f028
parent2397daab4a1b95a055514b009818730f4dfc4799 (diff)
Fixed #20990 -- Ensured unicode paths in compilemessages
Thanks Gregoire Astruc for the report and furins for the review.
-rw-r--r--django/core/management/commands/compilemessages.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/core/management/commands/compilemessages.py b/django/core/management/commands/compilemessages.py
index 931d9948e1..85a713cb45 100644
--- a/django/core/management/commands/compilemessages.py
+++ b/django/core/management/commands/compilemessages.py
@@ -6,7 +6,7 @@ from optparse import make_option
from django.core.management.base import BaseCommand, CommandError
from django.core.management.utils import find_command, popen_wrapper
-from django.utils._os import npath
+from django.utils._os import npath, upath
def has_bom(fn):
@@ -25,7 +25,7 @@ def compile_messages(stdout, locale=None):
basedirs = [os.path.join('conf', 'locale'), 'locale']
if os.environ.get('DJANGO_SETTINGS_MODULE'):
from django.conf import settings
- basedirs.extend(settings.LOCALE_PATHS)
+ basedirs.extend([upath(path) for path in settings.LOCALE_PATHS])
# Gather existing directories.
basedirs = set(map(os.path.abspath, filter(os.path.isdir, basedirs)))