Skip to content

pathlib: Fix glob/rglob to return Path objects rather than strings. #1120

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

Open
dpgeorge wants to merge 1 commit into
base: master
Choose a base branch
from
Open

pathlib: Fix glob/rglob to return Path objects rather than strings. #1120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion python-stdlib/pathlib/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
metadata(version="0.0.1")
metadata(version="0.0.2")

module("pathlib.py")
2 changes: 1 addition & 1 deletion python-stdlib/pathlib/pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def _glob(self, path, pattern, recursive):
for name, mode, *_ in os.ilistdir(path):
full_path = path + _SEP + name
if name.startswith(prefix) and name.endswith(suffix):
yield full_path
yield Path(full_path)
if recursive and mode & 0x4000: # is_dir
yield from self._glob(full_path, pattern, recursive=recursive)

Expand Down
10 changes: 8 additions & 2 deletions python-stdlib/pathlib/tests/test_pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,10 @@ def test_glob(self):
glob_gen = path.glob("*.txt")
self.assertTrue(_isgenerator(glob_gen))

res = [str(x) for x in glob_gen]
res = list(glob_gen)
for p in res:
self.assertIsInstance(p, Path)

self.assertTrue(len(res) == 2)
self.assertTrue(foo_txt in res)
self.assertTrue(bar_txt in res)
Expand All @@ -190,7 +193,10 @@ def test_rglob(self):
glob_gen = path.rglob("*.txt")
self.assertTrue(_isgenerator(glob_gen))

res = [str(x) for x in glob_gen]
res = list(glob_gen)
for p in res:
self.assertIsInstance(p, Path)

self.assertTrue(len(res) == 3)
self.assertTrue(foo_txt in res)
self.assertTrue(bar_txt in res)
Expand Down
Loading