Possible bad copy paste in `glob.py`

[wooffie]

I think it is bad copy paste here

cpython/Lib/glob.py

Line 74 in 7ec1742

yield pathname

Maybe we should yield dirname?

Additional information

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Reporter: Burkov Egor (eburkov@rvision.ru).

Organization: R-Vision (support@rvision.ru).

Linked PRs

• gh-129350: Fix potential bad copy paste #129366
• gh-129350: Make tests for glob with trailing slash more strict #129376
• [3.13] gh-129350: Make tests for glob with trailing slash more strict (GH-129376) #129651
• [3.12] gh-129350: Make tests for glob with trailing slash more strict (GH-129376) #129652

[StanFromIreland]

@serhiy-storchaka You created this, is this an error?

[encukou]

What is the problem here? What do you mean by "bad copy paste"?

This code was introduced in 6f20170, yield pathname has been working for a decade.

[serhiy-storchaka]

It was here from the beginning, and it was intentional (the difference is in the trailing slash). Surprisingly, the tests were not failed after your change, because they are too lenient in this question for some reasons.

It is better to make the tests more strict so any unintentional changes will be caught.

[wooffie]

I thought about this logic, but can we transform:

if basename:
    if _lexists(_join(root_dir, pathname), dir_fd):
        yield pathname
else:
# Patterns ending with a slash should match only directories
    if _isdir(_join(root_dir, dirname), dir_fd):
         yield pathname
    return

Into:

if _lexists(_join(root_dir, pathname), dir_fd) or _isdir(_join(root_dir, dirname), dir_fd):
     yield pathname
return

[encukou]

No, that would match nonexistent files (and remove a helpful comment).