Changeset 391 for python/trunk/Lib/macpath.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/macpath.py (modified) (1 diff)

python/trunk/Lib/macpath.py

@@ -207 +207 @@
     for c in components[1:]:
         path = join(path, c)
-        path = Carbon.File.FSResolveAliasFile(path, 1)[0].as_pathname()
-    return path
-
-supports_unicode_filenames = False
+        try:
+            path = Carbon.File.FSResolveAliasFile(path, 1)[0].as_pathname()
+        except Carbon.File.Error:
+            pass
+    return path
+
+supports_unicode_filenames = True