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.
diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index 75cbe49..11ba060 100644
--- a/Lib/ntpath.py
+++ b/Lib/ntpath.py
@@ -404,10 +404,10 @@
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)