Issue #17923: glob() patterns ending with a slash no longer match non-dirs on
AIX. Based on patch by Delhallt.
This commit is contained in:
parent
c04d468333
commit
6f20170762
13
Lib/glob.py
13
Lib/glob.py
|
@ -26,11 +26,16 @@ def iglob(pathname):
|
|||
patterns.
|
||||
|
||||
"""
|
||||
if not has_magic(pathname):
|
||||
if os.path.lexists(pathname):
|
||||
yield pathname
|
||||
return
|
||||
dirname, basename = os.path.split(pathname)
|
||||
if not has_magic(pathname):
|
||||
if basename:
|
||||
if os.path.lexists(pathname):
|
||||
yield pathname
|
||||
else:
|
||||
# Patterns ending with a slash should match only directories
|
||||
if os.path.isdir(dirname):
|
||||
yield pathname
|
||||
return
|
||||
if not dirname:
|
||||
yield from glob1(None, basename)
|
||||
return
|
||||
|
|
Loading…
Reference in New Issue