mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 79195 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Florent Xicluna 2010-03-21 12:29:50 +00:00
parent 53b95e77e0
commit 54467e0daa
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/macpath.py
View file

@ -193,7 +193,10 @@ def realpath(path):
path = components[0] + colon path = components[0] + colon
for c in components[1:]: for c in components[1:]:
path = join(path, c) 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 return path
supports_unicode_filenames = False supports_unicode_filenames = False

2
Misc/NEWS
View file

@ -285,6 +285,8 @@ C-API
Library Library
------- -------
- Issue #8179: Fix macpath.realpath() on a non-existing path.
- Issue #8024: Update the Unicode database to 5.2. - Issue #8024: Update the Unicode database to 5.2.
- Issue #8168: py_compile now handles files with utf-8 BOMS. - Issue #8168: py_compile now handles files with utf-8 BOMS.