Changeset 9411 for django/trunk/django/utils

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/utils/_os.py (modified) (2 diffs)

django/trunk/django/utils/_os.py

@@ -1 @@
-
+
+
-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 os.name == 'nt':
+    abspathu = abspath
+else:
+    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):
@@ -14 +34 @@
-    base = force_unicode(base)
-    paths = [force_unicode(p) for p in paths]
-
-
+u
+u
-    base_path_len = len(base_path)
-    # Ensure final_path starts with base_path and that the next character after