Changeset 9411 for django/trunk/django/template/loaders

Timestamp:

11/13/08 13:03:42 (2 months ago)

Author:

kmtracey

Message:

Fixed #9579 -- Properly handle apps running with (and specifically, loading 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.

Files:

• django/trunk/django/template/loaders/app_directories.py (modified) (3 diffs)

django/trunk/django/template/loaders/app_directories.py

@@ -5 +5 @@
-
-import os
+import sys
-
-from django.conf import settings
@@ -12 +13 @@
-
-# At compile time, cache the directories to search.
+fs_encoding = sys.getfilesystemencoding() or sys.getdefaultencoding()
-app_template_dirs = []
-for app in settings.INSTALLED_APPS:
@@ -28 +30 @@
-    template_dir = os.path.join(os.path.dirname(mod.__file__), 'templates')
-    if os.path.isdir(template_dir):
-
+.decode(fs_encoding)
-
-# It won't change, so convert it to a tuple to save memory.