Browse files

Fixed #9579 -- Properly handle apps running with (and specifically, l…

…oading templates from) a current working directory path that contains non-ASCII characters. Thanks for the report to gonzalodelgado and for advice on how to fix it to Daniel Pope.

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 5c4fcbb commit dfa90aec1bed28f581b0f0471dc95860bb166cc9 @kmtracey kmtracey committed Nov 13, 2008
Showing with 26 additions and 4 deletions.
  1. +3 −1 django/template/loaders/
  2. +23 −3 django/utils/
@@ -4,13 +4,15 @@
import os
+import sys
from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
from django.template import TemplateDoesNotExist
from django.utils._os import safe_join
# At compile time, cache the directories to search.
+fs_encoding = sys.getfilesystemencoding() or sys.getdefaultencoding()
app_template_dirs = []
for app in settings.INSTALLED_APPS:
i = app.rfind('.')
@@ -27,7 +29,7 @@
raise ImproperlyConfigured, 'ImportError %s: %s' % (app, e.args[0])
template_dir = os.path.join(os.path.dirname(mod.__file__), 'templates')
if os.path.isdir(template_dir):
- app_template_dirs.append(template_dir)
+ app_template_dirs.append(template_dir.decode(fs_encoding))
# It won't change, so convert it to a tuple to save memory.
app_template_dirs = tuple(app_template_dirs)
@@ -1,6 +1,26 @@
-from os.path import join, normcase, abspath, sep
+import os
+from os.path import join, normcase, normpath, abspath, isabs, sep
from django.utils.encoding import force_unicode
+# Define our own abspath function that can handle joining
+# unicode paths to a current working directory that has non-ASCII
+# characters in it. This isn't necessary on Windows since the
+# Windows version of abspath handles this correctly. The Windows
+# abspath also handles drive letters differently than the pure
+# Python implementation, so it's best not to replace it.
+if == 'nt':
+ abspathu = abspath
+ def abspathu(path):
+ """
+ Version of os.path.abspath that uses the unicode representation
+ of the current working directory, thus avoiding a UnicodeDecodeError
+ in join when the cwd has non-ASCII characters.
+ """
+ if not isabs(path):
+ path = join(os.getcwdu(), path)
+ return normpath(path)
def safe_join(base, *paths):
Joins one or more path components to the base path component intelligently.
@@ -13,8 +33,8 @@ def safe_join(base, *paths):
# insensitive operating systems (like Windows).
base = force_unicode(base)
paths = [force_unicode(p) for p in paths]
- final_path = normcase(abspath(join(base, *paths)))
- base_path = normcase(abspath(base))
+ final_path = normcase(abspathu(join(base, *paths)))
+ base_path = normcase(abspathu(base))
base_path_len = len(base_path)
# Ensure final_path starts with base_path and that the next character after
# the final path is os.sep (or nothing, in which case final_path must be

0 comments on commit dfa90ae

Please sign in to comment.