Browse Source

Issue #17923: glob() patterns ending with a slash no longer match non-dirs on

AIX.  Based on patch by Delhallt.
pull/224/head
Serhiy Storchaka 12 years ago
parent
commit
6f20170762
  1. 11
      Lib/glob.py
  2. 3
      Misc/NEWS

11
Lib/glob.py

@ -26,11 +26,16 @@ def iglob(pathname):
patterns.
"""
dirname, basename = os.path.split(pathname)
if not has_magic(pathname):
if os.path.lexists(pathname):
yield 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
dirname, basename = os.path.split(pathname)
if not dirname:
yield from glob1(None, basename)
return

3
Misc/NEWS

@ -27,6 +27,9 @@ Core and Builtins
Library
-------
- Issue #17923: glob() patterns ending with a slash no longer match non-dirs on
AIX. Based on patch by Delhallt.
- Issue #21121: Don't force 3rd party C extensions to be built with
-Werror=declaration-after-statement.

Loading…
Cancel
Save