diff options
| -rw-r--r-- | Lib/ntpath.py | 42 | ||||
| -rw-r--r-- | Lib/test/test_ntpath.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2018-07-29-14-12-23.bpo-31047.FSarLs.rst | 2 |
3 files changed, 26 insertions, 22 deletions
diff --git a/Lib/ntpath.py b/Lib/ntpath.py index 2182ec776c..f0e03a2f49 100644 --- a/Lib/ntpath.py +++ b/Lib/ntpath.py @@ -496,38 +496,36 @@ def normpath(path): comps.append(curdir) return prefix + sep.join(comps) +def _abspath_fallback(path): + """Return the absolute version of a path as a fallback function in case + `nt._getfullpathname` is not available or raises OSError. See bpo-31047 for + more. + + """ + + path = os.fspath(path) + if not isabs(path): + if isinstance(path, bytes): + cwd = os.getcwdb() + else: + cwd = os.getcwd() + path = join(cwd, path) + return normpath(path) # Return an absolute path. try: from nt import _getfullpathname except ImportError: # not running on Windows - mock up something sensible - def abspath(path): - """Return the absolute version of a path.""" - path = os.fspath(path) - if not isabs(path): - if isinstance(path, bytes): - cwd = os.getcwdb() - else: - cwd = os.getcwd() - path = join(cwd, path) - return normpath(path) + abspath = _abspath_fallback else: # use native Windows method on Windows def abspath(path): """Return the absolute version of a path.""" - - if path: # Empty path must return current working directory. - path = os.fspath(path) - try: - path = _getfullpathname(path) - except OSError: - pass # Bad path - return unchanged. - elif isinstance(path, bytes): - path = os.getcwdb() - else: - path = os.getcwd() - return normpath(path) + try: + return _getfullpathname(path) + except OSError: + return _abspath_fallback(path) # realpath is a no-op on systems without islink support realpath = abspath diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py index 1e85ad5a75..f37a9945ff 100644 --- a/Lib/test/test_ntpath.py +++ b/Lib/test/test_ntpath.py @@ -280,6 +280,10 @@ class TestNtpath(unittest.TestCase): @unittest.skipUnless(nt, "abspath requires 'nt' module") def test_abspath(self): tester('ntpath.abspath("C:\\")', "C:\\") + with support.temp_cwd(support.TESTFN) as cwd_dir: # bpo-31047 + tester('ntpath.abspath("")', cwd_dir) + tester('ntpath.abspath(" ")', cwd_dir + "\\ ") + tester('ntpath.abspath("?")', cwd_dir + "\\?") def test_relpath(self): tester('ntpath.relpath("a")', 'a') diff --git a/Misc/NEWS.d/next/Library/2018-07-29-14-12-23.bpo-31047.FSarLs.rst b/Misc/NEWS.d/next/Library/2018-07-29-14-12-23.bpo-31047.FSarLs.rst new file mode 100644 index 0000000000..6415d4a95a --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-07-29-14-12-23.bpo-31047.FSarLs.rst @@ -0,0 +1,2 @@ +Fix ``ntpath.abspath`` for invalid paths on windows. Patch by Franz +Woellert. |