Changeset 9161 for django/trunk/django/utils

Timestamp:

10/06/08 01:34:54 (2 months ago)

Author:

mtredinnick

Message:

Added some better error reporting and path handling when creating template paths.

We now raise UnicodeDecodeError? for non-UTF-8 bytestrings (thanks to Daniel
Pope for diagnosing this was being swallowed by ValueError?) and allow UTF-8
bytestrings as template directories.

Refs #8965.

Files:

• django/trunk/django/utils/_os.py (modified) (2 diffs)

django/trunk/django/utils/_os.py

@@ -1 +1 @@
-from os.path import join, normcase, abspath, sep
+from django.utils.encoding import force_unicode
-
-def safe_join(base, *paths):
@@ -11 +12 @@
-    # We need to use normcase to ensure we don't false-negative on case
-    # 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))