Skip to content

GH-77609: Add follow_symlinks argument to pathlib.Path.glob() #102616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
barneygale merged 17 commits into from
May 29, 2023
Merged

GH-77609: Add follow_symlinks argument to pathlib.Path.glob() #102616

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
59dcdb1
GH-77609: Support following symlinks in `pathlib.Path.glob()`
barneygale Mar 12, 2023
e850bde
Fix top-level error handling.
barneygale Mar 12, 2023
4f4ffd3
Always follow top-level symlink
barneygale Mar 12, 2023
b6c019e
Simplify test diff slightly
barneygale Mar 12, 2023
8d657ee
Clarify docs for *follow_symlinks* argument
barneygale Mar 14, 2023
b600363
Backwards compatibility
barneygale Mar 14, 2023
b2766f8
Fix handling of '..' in patterns.
barneygale Mar 14, 2023
8704d33
Deprecate follow_symlinks=None
barneygale Mar 14, 2023
6f7a83a
Fix news
barneygale Mar 14, 2023
5fb7d28
Merge branch 'main' into gh-77609-glob-follow-symlinks
barneygale May 3, 2023
ce7973f
Revert "Fix news"
barneygale May 10, 2023
2db28d9
Revert "Deprecate follow_symlinks=None"
barneygale May 10, 2023
d3a3396
Merge branch 'main' into gh-77609-glob-follow-symlinks
barneygale May 10, 2023
6c61822
Merge branch 'main' into gh-77609-glob-follow-symlinks
barneygale May 11, 2023
3722b64
Merge branch 'main' into gh-77609-glob-follow-symlinks
barneygale May 15, 2023
9700dd1
Merge branch 'main' into gh-77609-glob-follow-symlinks
barneygale May 23, 2023
4f2a492
Re-target to 3.13
barneygale May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix handling of '..' in patterns.
  • Loading branch information
@barneygale
barneygale committed Mar 14, 2023
commit b2766f8b2237bea8d335f792a8e160ffc10b13e2
11 changes: 11 additions & 0 deletions Lib/pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ def _make_selector(pattern_parts, flavour):
cls = _RecursiveWildcardSelector
elif '**' in pat:
raise ValueError("Invalid pattern: '**' can only be an entire path component")
elif pat == '..':
cls = _ParentSelector
else:
cls = _WildcardSelector
return cls(pat, child_parts, flavour)
Expand Down Expand Up @@ -103,6 +105,15 @@ def _select_from(self, parent_path, follow_symlinks, scandir, normcase):
yield parent_path


class _ParentSelector(_Selector):
def __init__(self, pat, child_parts, flavour):
_Selector.__init__(self, child_parts, flavour)

def _select_from(self, parent_path, follow_symlinks, scandir, normcase):
path = parent_path._make_child_relpath('..')
return self.successor._select_from(path, follow_symlinks, scandir, normcase)


class _WildcardSelector(_Selector):

def __init__(self, pat, child_parts, flavour):
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1939,8 +1939,8 @@ def test_glob_dotdot(self):
# ".." is not special in globs.
P = self.cls
p = P(BASE)
self.assertEqual(set(p.glob("..")), set())
self.assertEqual(set(p.glob("dirA/../file*")), set())
self.assertEqual(set(p.glob("..")), { P(BASE, "..") })
self.assertEqual(set(p.glob("dirA/../file*")), { P(BASE, "dirA/../fileA") })
self.assertEqual(set(p.glob("../xyzzy")), set())

@os_helper.skip_unless_symlink
Expand Down