bpo-31047: Fix ntpath.abspath to trim ending separator (GH-10082)
Regression in b0bf51b32240369ccb736dc32ff82bb96f375402.
diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index 0e6de28..11bb297 100644
--- a/Lib/ntpath.py
+++ b/Lib/ntpath.py
@@ -523,7 +523,7 @@
def abspath(path):
"""Return the absolute version of a path."""
try:
- return _getfullpathname(path)
+ return normpath(_getfullpathname(path))
except (OSError, ValueError):
return _abspath_fallback(path)
diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py
index f37a994..223e50f 100644
--- a/Lib/test/test_ntpath.py
+++ b/Lib/test/test_ntpath.py
@@ -284,6 +284,8 @@
tester('ntpath.abspath("")', cwd_dir)
tester('ntpath.abspath(" ")', cwd_dir + "\\ ")
tester('ntpath.abspath("?")', cwd_dir + "\\?")
+ drive, _ = ntpath.splitdrive(cwd_dir)
+ tester('ntpath.abspath("/abc/")', drive + "\\abc")
def test_relpath(self):
tester('ntpath.relpath("a")', 'a')
diff --git a/Misc/NEWS.d/next/Library/2018-10-25-09-37-03.bpo-31047.kBbX8r.rst b/Misc/NEWS.d/next/Library/2018-10-25-09-37-03.bpo-31047.kBbX8r.rst
new file mode 100644
index 0000000..1e47bf4
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-10-25-09-37-03.bpo-31047.kBbX8r.rst
@@ -0,0 +1,2 @@
+Fix ``ntpath.abspath`` regression where it didn't remove a trailing
+separator on Windows. Patch by Tim Graham.