[Python-checkins] bpo-31047: Fix ntpath.abspath to trim ending separator (GH-10082)

[Steve Dower]

https://github.com/python/cpython/commit/4aa1fda7069642c21c1ee570c4ba44442a657e5e
commit: 4aa1fda7069642c21c1ee570c4ba44442a657e5e
branch: 3.6
author: Steve Dower <steve.dower at microsoft.com>
committer: GitHub <noreply at github.com>
date: 2018-10-25T13:46:33-04:00
summary:

bpo-31047: Fix ntpath.abspath to trim ending separator (GH-10082)

files:
A Misc/NEWS.d/next/Library/2018-10-25-09-37-03.bpo-31047.kBbX8r.rst
M Lib/ntpath.py
M Lib/test/test_ntpath.py

diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index 24113e701d11..1b23a15a945a 100644
--- a/Lib/ntpath.py
+++ b/Lib/ntpath.py
@@ -545,8 +545,8 @@ def _abspath_fallback(path):
     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 f93d902d32fa..bba1712ccef5 100644
--- a/Lib/test/test_ntpath.py
+++ b/Lib/test/test_ntpath.py
@@ -307,6 +307,8 @@ def test_abspath(self):
                 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")
         except ImportError:
             self.skipTest('nt module not available')
 
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.