[Python-checkins] r79196 - in python/branches/py3k: Lib/macpath.py Misc/NEWS

[florent.xicluna]

Author: florent.xicluna
Date: Sun Mar 21 13:29:50 2010
New Revision: 79196

Log:
Merged revisions 79195 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79195 | florent.xicluna | 2010-03-21 13:27:20 +0100 (dim, 21 mar 2010) | 2 lines
  
  Issue #8179: Fix macpath.realpath() on a non-existing path.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/macpath.py
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Lib/macpath.py
==============================================================================
--- python/branches/py3k/Lib/macpath.py	(original)
+++ python/branches/py3k/Lib/macpath.py	Sun Mar 21 13:29:50 2010
@@ -193,7 +193,10 @@
     path = components[0] + colon
     for c in components[1:]:
         path = join(path, c)
-        path = Carbon.File.FSResolveAliasFile(path, 1)[0].as_pathname()
+        try:
+            path = Carbon.File.FSResolveAliasFile(path, 1)[0].as_pathname()
+        except Carbon.File.Error:
+            pass
     return path
 
 supports_unicode_filenames = False

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sun Mar 21 13:29:50 2010
@@ -285,6 +285,8 @@
 Library
 -------
 
+- Issue #8179: Fix macpath.realpath() on a non-existing path.
+
 - Issue #8024: Update the Unicode database to 5.2.
 
 - Issue #8168: py_compile now handles files with utf-8 BOMS.