Split pull request

Author: nineteendo

Lib/ntpath.py

@@ -554,49 +554,37 @@ def normpath(path):
         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 _path_normpath_ex as _normpath
     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."""
         try:
             return _getfullpathname(_normpath(path, explicit_curdir=True))
         except (OSError, ValueError):
-            # See gh-75230, handle outside for cleaner traceback
-            pass
-        path = os.fspath(path)
-        if not isabs(path):
-            if isinstance(path, bytes):
-                sep = b'/'
-                cwd = os.getcwdb()
-            else:
-                sep = '/'
-                cwd = os.getcwd()
-            drive, root, path = splitroot(path)
-            if drive and drive != splitroot(cwd)[0]:
-                try:
-                    path = join(_getfullpathname(drive), path)
-                except (OSError, ValueError):
-                    # Invalid drive \x00: on Windows; assume root directory
-                    path = drive + sep + path
-            else:
-                path = join(cwd, root + path)
-        return normpath(path)
+            return _abspath_fallback(path)
 
 try:
     from nt import _findfirstfile, _getfinalpathname, readlink as _nt_readlink

Lib/test/test_ntpath.py

@@ -808,9 +808,6 @@ def test_abspath(self):
         tester('ntpath.abspath("C:\\spam. . .")', "C:\\spam")
         tester('ntpath.abspath("C:/nul")',  "\\\\.\\nul")
         tester('ntpath.abspath("C:\\nul")', "\\\\.\\nul")
-        self.assertTrue(ntpath.isabs(ntpath.abspath("C:spam")))
-        self.assertTrue(ntpath.isabs(ntpath.abspath("C:\x00")))
-        self.assertTrue(ntpath.isabs(ntpath.abspath("\x00:spam")))
         tester('ntpath.abspath("//..")',           "\\\\")
         tester('ntpath.abspath("//../")',          "\\\\..\\")
         tester('ntpath.abspath("//../..")',        "\\\\..\\")