In abspath(), always use normpath(), even when win32api is available

(and even when it fails).  This avoids the problem where a trailing
separator is not removed when win32api.GetFullPathName() is used.
This commit is contained in:
Guido van Rossum 1999-11-30 15:00:00 +00:00
parent d25c1b73d2
commit 6dfc792fea

View file

@ -404,10 +404,10 @@ def abspath(path):
try:
import win32api
try:
return win32api.GetFullPathName(path)
path = win32api.GetFullPathName(path)
except win32api.error:
return path # Bad path - return unchanged.
pass # Bad path - return unchanged.
except ImportError:
if not isabs(path):
path = join(os.getcwd(), path)
return normpath(path)
return normpath(path)