do not follow links when checking for precise glob match

akulakov · akulakov · commit 272c1b41b52d · 2021-11-19T22:48:36.000-05:00
diff --git a/Lib/pathlib.py b/Lib/pathlib.py
@@ -422,7 +422,8 @@ def __init__(self, name, child_parts, flavour):
     def _select_from(self, parent_path, is_dir, exists, scandir):
         try:
             path = parent_path._make_child_relpath(self.name)
-            if (is_dir if self.dironly else exists)(path):
+            if ((self.dironly and is_dir(path)) or \
+                    (not self.dironly and exists(path, follow_symlinks=False))):
                 for p in self.successor._select_from(path, is_dir, exists, scandir):
                     yield p
         except PermissionError:
@@ -1280,12 +1281,12 @@ def link_to(self, target):
 
     # Convenience functions for querying the stat results
 
-    def exists(self):
+    def exists(self, follow_symlinks=True):
         """
         Whether this path exists.
         """
         try:
-            self.stat()
+            self.stat(follow_symlinks=follow_symlinks)
         except OSError as e:
             if not _ignore_error(e):
                 raise
diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py
@@ -1529,6 +1529,7 @@ def test_exists(self):
         self.assertIs(False, P('/xyzzy').exists())
         self.assertIs(False, P(BASE + '\udfff').exists())
         self.assertIs(False, P(BASE + '\x00').exists())
+        self.assertIs(False, (p / 'brokenLink').exists())
 
     def test_open_common(self):
         p = self.cls(BASE)
@@ -1631,6 +1632,8 @@ def _check(glob, expected):
             _check(p.glob("*/fileB"), ['dirB/fileB'])
         else:
             _check(p.glob("*/fileB"), ['dirB/fileB', 'linkB/fileB'])
+        if os_helper.can_symlink():
+            _check(p.glob("brokenLink"), ['brokenLink'])
 
     def test_rglob_common(self):
         def _check(glob, expected):
