From a7ffb663953bc84452af1e5f4089359d54e226b5 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Thu, 25 Oct 2018 13:46:23 -0400 Subject: [PATCH] [3.7] bpo-31047: Fix ntpath.abspath to trim ending separator (GH-10082) --- Lib/ntpath.py | 4 ++-- Lib/test/test_ntpath.py | 2 ++ .../next/Library/2018-10-25-09-37-03.bpo-31047.kBbX8r.rst | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2018-10-25-09-37-03.bpo-31047.kBbX8r.rst diff --git a/Lib/ntpath.py b/Lib/ntpath.py index f0e03a2f496a..3c820b5d0eb7 100644 --- a/Lib/ntpath.py +++ b/Lib/ntpath.py @@ -523,8 +523,8 @@ else: # use native Windows method on Windows def abspath(path): """Return the absolute version of a path.""" try: - return _getfullpathname(path) - except OSError: + return normpath(_getfullpathname(path)) + except (OSError, ValueError): return _abspath_fallback(path) # realpath is a no-op on systems without islink support diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py index 907ca7edbead..6e31b6441122 100644 --- a/Lib/test/test_ntpath.py +++ b/Lib/test/test_ntpath.py @@ -284,6 +284,8 @@ class TestNtpath(unittest.TestCase): 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 000000000000..1e47bf4174e7 --- /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. -- 2.47.3