summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarney Gale <barney.gale@gmail.com>2023-05-10 17:17:08 (GMT)
committerGitHub <noreply@github.com>2023-05-10 17:17:08 (GMT)
commita33ce66dca57d4c36b1022fdf3b7e322f3203468 (patch)
tree65ab2d9b7e48c20ecd03028bbd466e16b0f06c05
parent7a3b03509e5e3e72d8c47137579cccb52548a318 (diff)
downloadcpython-a33ce66dca57d4c36b1022fdf3b7e322f3203468.zip
cpython-a33ce66dca57d4c36b1022fdf3b7e322f3203468.tar.gz
cpython-a33ce66dca57d4c36b1022fdf3b7e322f3203468.tar.bz2
GH-87695: Fix OSError from `pathlib.Path.glob()` (GH-104292)
Fix issue where `pathlib.Path.glob()` raised `OSError` when it encountered a symlink to an overly long path.
-rw-r--r--Lib/pathlib.py4
-rw-r--r--Lib/test/test_pathlib.py9
-rw-r--r--Misc/NEWS.d/next/Library/2023-05-08-15-39-00.gh-issue-87695.f6iO7v.rst2
3 files changed, 13 insertions, 2 deletions
diff --git a/Lib/pathlib.py b/Lib/pathlib.py
index 20ec1ce..25863c7 100644
--- a/Lib/pathlib.py
+++ b/Lib/pathlib.py
@@ -178,11 +178,11 @@ class _RecursiveWildcardSelector(_Selector):
for entry in entries:
entry_is_dir = False
try:
- entry_is_dir = entry.is_dir()
+ entry_is_dir = entry.is_dir(follow_symlinks=False)
except OSError as e:
if not _ignore_error(e):
raise
- if entry_is_dir and not entry.is_symlink():
+ if entry_is_dir:
path = parent_path._make_child_relpath(entry.name)
for p in self._iterate_directories(path, scandir):
yield p
diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py
index ee0ef9a..10dd604 100644
--- a/Lib/test/test_pathlib.py
+++ b/Lib/test/test_pathlib.py
@@ -1977,6 +1977,15 @@ class _BasePathTest(object):
subdir.chmod(000)
self.assertEqual(len(set(base.glob("*"))), 4)
+ @os_helper.skip_unless_symlink
+ def test_glob_long_symlink(self):
+ # See gh-87695
+ base = self.cls(BASE) / 'long_symlink'
+ base.mkdir()
+ bad_link = base / 'bad_link'
+ bad_link.symlink_to("bad" * 200)
+ self.assertEqual(sorted(base.glob('**/*')), [bad_link])
+
def _check_resolve(self, p, expected, strict=True):
q = p.resolve(strict)
self.assertEqual(q, expected)
diff --git a/Misc/NEWS.d/next/Library/2023-05-08-15-39-00.gh-issue-87695.f6iO7v.rst b/Misc/NEWS.d/next/Library/2023-05-08-15-39-00.gh-issue-87695.f6iO7v.rst
new file mode 100644
index 0000000..7b67765
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-05-08-15-39-00.gh-issue-87695.f6iO7v.rst
@@ -0,0 +1,2 @@
+Fix issue where :meth:`pathlib.Path.glob` raised :exc:`OSError` when it
+encountered a symlink to an overly long path.