Commitaeffc7f

authored

gh-79382: Fix recursive glob() with trailing "**" (GH-115134)

Trailing "**" no longer allows to match files and non-existing paths inrecursive glob().

1 parent573acb3 commitaeffc7fCopy full SHA for aeffc7f

File tree

+15

-1

lines changed

+15

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,8 @@ def glob1(dirname, pattern):`
`132`	`132`
`133`	`133`	`def_glob2(dirname,pattern,dir_fd,dironly,include_hidden=False):`
`134`	`134`	`assert_isrecursive(pattern)`
`135`		`-yieldpattern[:0]`
	`135`	`+ifnotdirnameor_isdir(dirname,dir_fd):`
	`136`	`+yieldpattern[:0]`
`136`	`137`	`yieldfrom_rlistdir(dirname,dir_fd,dironly,`
`137`	`138`	`include_hidden=include_hidden)`
`138`	`139`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -333,6 +333,17 @@ def test_recursive_glob(self):`
`333`	`333`	`eq(glob.glob('**',recursive=True,include_hidden=True),`
`334`	`334`	`[join(*i)foriinfull+rec])`
`335`	`335`
	`336`	`+deftest_glob_non_directory(self):`
	`337`	`+eq=self.assertSequencesEqual_noorder`
	`338`	`+eq(self.rglob('EF'),self.joins(('EF',)))`
	`339`	`+eq(self.rglob('EF',''), [])`
	`340`	`+eq(self.rglob('EF','*'), [])`
	`341`	`+eq(self.rglob('EF','**'), [])`
	`342`	`+eq(self.rglob('nonexistent'), [])`
	`343`	`+eq(self.rglob('nonexistent',''), [])`
	`344`	`+eq(self.rglob('nonexistent','*'), [])`
	`345`	`+eq(self.rglob('nonexistent','**'), [])`
	`346`	`+`
`336`	`347`	`deftest_glob_many_open_files(self):`
`337`	`348`	`depth=30`
`338`	`349`	`base=os.path.join(self.tempdir,'deep')`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Trailing ``**`` no longer allows to match files and non-existing paths in
	`2`	+recursive:func:`~glob.glob`.

Comments

(0)