mirror of
https://github.com/python/cpython
synced 2024-09-06 08:05:11 +00:00
[3.12] gh-79382: Fix recursive glob() with trailing "**" (GH-115134) (GH-115290)
Trailing "**" no longer allows to match files and non-existing paths in
recursive glob().
(cherry picked from commit aeffc7f895
)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This commit is contained in:
parent
b9f560258c
commit
d65cd8bc4e
|
@ -132,7 +132,8 @@ def glob1(dirname, pattern):
|
|||
|
||||
def _glob2(dirname, pattern, dir_fd, dironly, include_hidden=False):
|
||||
assert _isrecursive(pattern)
|
||||
yield pattern[:0]
|
||||
if not dirname or _isdir(dirname, dir_fd):
|
||||
yield pattern[:0]
|
||||
yield from _rlistdir(dirname, dir_fd, dironly,
|
||||
include_hidden=include_hidden)
|
||||
|
||||
|
|
|
@ -332,6 +332,17 @@ def test_recursive_glob(self):
|
|||
eq(glob.glob('**', recursive=True, include_hidden=True),
|
||||
[join(*i) for i in full+rec])
|
||||
|
||||
def test_glob_non_directory(self):
|
||||
eq = self.assertSequencesEqual_noorder
|
||||
eq(self.rglob('EF'), self.joins(('EF',)))
|
||||
eq(self.rglob('EF', ''), [])
|
||||
eq(self.rglob('EF', '*'), [])
|
||||
eq(self.rglob('EF', '**'), [])
|
||||
eq(self.rglob('nonexistent'), [])
|
||||
eq(self.rglob('nonexistent', ''), [])
|
||||
eq(self.rglob('nonexistent', '*'), [])
|
||||
eq(self.rglob('nonexistent', '**'), [])
|
||||
|
||||
def test_glob_many_open_files(self):
|
||||
depth = 30
|
||||
base = os.path.join(self.tempdir, 'deep')
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
Trailing ``**`` no longer allows to match files and non-existing paths in
|
||||
recursive :func:`~glob.glob`.
|
Loading…
Reference in a new issue