Commita33ce66

authored

GH-87695: Fix OSError frompathlib.Path.glob() (GH-104292)

Fix issue where `pathlib.Path.glob()` raised `OSError` when it encountereda symlink to an overly long path.

1 parent7a3b035 commita33ce66Copy full SHA for a33ce66

File tree

+13

-2

lines changed

+13

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -178,11 +178,11 @@ def _iterate_directories(self, parent_path, scandir):`
`178`	`178`	`forentryinentries:`
`179`	`179`	`entry_is_dir=False`
`180`	`180`	`try:`
`181`		`-entry_is_dir=entry.is_dir()`
	`181`	`+entry_is_dir=entry.is_dir(follow_symlinks=False)`
`182`	`182`	`exceptOSErrorase:`
`183`	`183`	`ifnot_ignore_error(e):`
`184`	`184`	`raise`
`185`		`-ifentry_is_dirandnotentry.is_symlink():`
	`185`	`+ifentry_is_dir:`
`186`	`186`	`path=parent_path._make_child_relpath(entry.name)`
`187`	`187`	`forpinself._iterate_directories(path,scandir):`
`188`	`188`	`yieldp`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1977,6 +1977,15 @@ def my_scandir(path):`
`1977`	`1977`	`subdir.chmod(000)`
`1978`	`1978`	`self.assertEqual(len(set(base.glob("*"))),4)`
`1979`	`1979`
	`1980`	`+@os_helper.skip_unless_symlink`
	`1981`	`+deftest_glob_long_symlink(self):`
	`1982`	`+# See gh-87695`
	`1983`	`+base=self.cls(BASE)/'long_symlink'`
	`1984`	`+base.mkdir()`
	`1985`	`+bad_link=base/'bad_link'`
	`1986`	`+bad_link.symlink_to("bad"*200)`
	`1987`	`+self.assertEqual(sorted(base.glob('*/')), [bad_link])`
	`1988`	`+`
`1980`	`1989`	`def_check_resolve(self,p,expected,strict=True):`
`1981`	`1990`	`q=p.resolve(strict)`
`1982`	`1991`	`self.assertEqual(q,expected)`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix issue where:meth:`pathlib.Path.glob` raised:exc:`OSError` when it
	`2`	`+encountered a symlink to an overly long path.`

Comments

(0)