bpo-31047: Fix ntpath.abspath for invalid paths (GH-8544)
diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index 2182ec7..f0e03a2 100644
--- a/Lib/ntpath.py
+++ b/Lib/ntpath.py
@@ -496,38 +496,36 @@
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