diff options
Diffstat (limited to 'Lib/glob.py')
| -rw-r--r-- | Lib/glob.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Lib/glob.py b/Lib/glob.py index f16e8e16e4..c9f811720a 100644 --- a/Lib/glob.py +++ b/Lib/glob.py @@ -26,8 +26,7 @@ def iglob(pathname): return dirname, basename = os.path.split(pathname) if not dirname: - for name in glob1(None, basename): - yield name + yield from glob1(None, basename) return # `os.path.split()` returns the argument itself as a dirname if it is a # drive or UNC path. Prevent an infinite recursion if a drive or UNC path @@ -56,7 +55,7 @@ def glob1(dirname, pattern): dirname = os.curdir try: names = os.listdir(dirname) - except os.error: + except OSError: return [] if not _ishidden(pattern): names = [x for x in names if not _ishidden(x)] |