From 54467e0daaadb5a9bb5ca8a3c7654dd310d2f230 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Sun, 21 Mar 2010 12:29:50 +0000 Subject: [PATCH] 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. ........ --- Lib/macpath.py | 5 ++++- Misc/NEWS | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Lib/macpath.py b/Lib/macpath.py index f58a195792..3b3e4ff071 100644 --- a/Lib/macpath.py +++ b/Lib/macpath.py @@ -193,7 +193,10 @@ def realpath(path): 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 diff --git a/Misc/NEWS b/Misc/NEWS index 7c8c7119e4..e85ab0013d 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -285,6 +285,8 @@ C-API 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. -- 2.50.1