Remove get_target_path and fix tests

zooba · Aug 12, 2019 · Aug 12, 2019 · Aug 12, 2019 · Aug 13, 2019 · Aug 13, 2019
commit 541dcf8b92061da5902dedcd7b48b5959c289fa3
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
@@ -2258,12 +2258,13 @@ def assertPathEqual(self, left, right):
         left = os.path.normcase(left)
         right = os.path.normcase(right)
         if sys.platform == 'win32':
-            # Stripping prefixes blindly is generally bad practice,
-            # but all we are doing here is comparing the paths, so
-            # it works out okay.
-            if left[:4] in ('\\\\?\\', b'\\\\?\\'):
+            # Bad practice to blindly strip the prefix as it may be required to
+            # correctly refer to the file, but we're only comparing paths here.
+            has_prefix = lambda p: p.startswith(
+                b'\\\\?\\' if isinstance(p, bytes) else '\\\\?\\')
+            if has_prefix(left):
                 left = left[4:]
-            if right[:4] in ('\\\\?\\', b'\\\\?\\'):
+            if has_prefix(right):
                 right = right[4:]
         self.assertEqual(left, right)
 

diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
@@ -754,8 +754,12 @@ def test_copytree_symlinks(self):
         src_stat = os.lstat(src_link)
         shutil.copytree(src_dir, dst_dir, symlinks=True)
         self.assertTrue(os.path.islink(os.path.join(dst_dir, 'sub', 'link')))
-        self.assertEqual(os.readlink(os.path.join(dst_dir, 'sub', 'link')),
-                         os.path.join(src_dir, 'file.txt'))
+        actual = os.readlink(os.path.join(dst_dir, 'sub', 'link'))
+        # Bad practice to blindly strip the prefix as it may be required to
+        # correctly refer to the file, but we're only comparing paths here.
+        if os.name == 'nt' and actual.startswith('\\\\?\\'):
+            actual = actual[4:]
+        self.assertEqual(actual, os.path.join(src_dir, 'file.txt'))
         dst_stat = os.lstat(dst_link)
         if hasattr(os, 'lchmod'):
             self.assertEqual(dst_stat.st_mode, src_stat.st_mode)

diff --git a/Lib/test/test_tools/test_lll.py b/Lib/test/test_tools/test_lll.py
@@ -27,12 +27,13 @@ def test_lll_multiple_dirs(self):
 
             with support.captured_stdout() as output:
                 self.lll.main([dir1, dir2])
+            prefix = '\\\\?\\' if os.name == 'nt' else ''
             self.assertEqual(output.getvalue(),
                 f'{dir1}:\n'
-                f'symlink -> {fn1}\n'
+                f'symlink -> {prefix}{fn1}\n'
                 f'\n'
                 f'{dir2}:\n'
-                f'symlink -> {fn2}\n'
+                f'symlink -> {prefix}{fn2}\n'
             )
 
 

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -1659,39 +1659,6 @@ attributes_from_dir(LPCWSTR pszFile, BY_HANDLE_FILE_INFORMATION *info, ULONG *re
     return TRUE;
 }
 
-static BOOL
-get_target_path(HANDLE hdl, wchar_t **target_path)
-{
-    int buf_size, result_length;
-    wchar_t *buf;
-
-    /* We have a good handle to the target, use it to determine
-       the target path name (then we'll call lstat on it). */
-    buf_size = GetFinalPathNameByHandleW(hdl, 0, 0,
-                                         VOLUME_NAME_DOS);
-    if(!buf_size)
-        return FALSE;
-
-    buf = (wchar_t *)PyMem_RawMalloc((buf_size + 1) * sizeof(wchar_t));
-    if (!buf) {
-        SetLastError(ERROR_OUTOFMEMORY);
-        return FALSE;
-    }
-
-    result_length = GetFinalPathNameByHandleW(hdl,
-                       buf, buf_size, VOLUME_NAME_DOS);
-
-    if(!result_length) {
-        PyMem_RawFree(buf);
-        return FALSE;
-    }
-
-    buf[result_length] = 0;
-
-    *target_path = buf;
-    return TRUE;
-}
-
 static int
 win32_xstat_impl(const wchar_t *path, struct _Py_stat_struct *result,
                  BOOL traverse)