From 9dba901d9c44a117b35003e0c239476536c259aa Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Sun, 15 Feb 2015 18:59:39 -0500 Subject: [PATCH] [1.8.x] Refs #24324 -- Fixed makemessages crash when Django is installed in a non-ASCII path. Backport of 81a94cc616ab80decaa495cfa1c0c623527fc0e7 from master --- django/core/management/commands/makemessages.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/django/core/management/commands/makemessages.py b/django/core/management/commands/makemessages.py index 48608feb9b1..2afbc8949c8 100644 --- a/django/core/management/commands/makemessages.py +++ b/django/core/management/commands/makemessages.py @@ -16,6 +16,7 @@ from django.core.management.utils import ( find_command, handle_extensions, popen_wrapper, ) from django.utils import six +from django.utils._os import upath from django.utils.encoding import force_str from django.utils.functional import cached_property, total_ordering from django.utils.jslex import prepare_js_for_gettext @@ -472,7 +473,7 @@ class Command(BaseCommand): the msgs string, inserting it at the right place. msgs should be the contents of a newly created .po file. """ - django_dir = os.path.normpath(os.path.join(os.path.dirname(django.__file__))) + django_dir = os.path.normpath(os.path.join(os.path.dirname(upath(django.__file__)))) if self.domain == 'djangojs': domains = ('djangojs', 'django') else: