traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Regression in b0bf51b322.
This commit is contained in:
Tim Graham 2018-10-25 11:26:38 -04:00 committed by Steve Dower
parent e25d5fc18e
commit d03b775781
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/ntpath.py
View File

@ -523,7 +523,7 @@ else: # use native Windows method on Windows
def abspath(path): def abspath(path):
"""Return the absolute version of a path.""" """Return the absolute version of a path."""
try: try:
return _getfullpathname(path) return normpath(_getfullpathname(path))
except (OSError, ValueError): except (OSError, ValueError):
return _abspath_fallback(path) return _abspath_fallback(path)

2
Lib/test/test_ntpath.py
View File

@ -284,6 +284,8 @@ class TestNtpath(unittest.TestCase):
tester('ntpath.abspath("")', cwd_dir) tester('ntpath.abspath("")', cwd_dir)
tester('ntpath.abspath(" ")', cwd_dir + "\\ ") 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): def test_relpath(self):
tester('ntpath.relpath("a")', 'a') tester('ntpath.relpath("a")', 'a')

2
Misc/NEWS.d/next/Library/2018-10-25-09-37-03.bpo-31047.kBbX8r.rst Normal file
View File

@ -0,0 +1,2 @@
Fix ``ntpath.abspath`` regression where it didn't remove a trailing
separator on Windows. Patch by Tim Graham.