diff options
Diffstat (limited to 'Lib/glob.py')
| -rw-r--r-- | Lib/glob.py | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/Lib/glob.py b/Lib/glob.py index 7c3cccb..002cd92 100644 --- a/Lib/glob.py +++ b/Lib/glob.py @@ -118,22 +118,13 @@ def _iterdir(dirname, dironly): else: dirname = os.curdir try: - if os.name == 'nt' and isinstance(dirname, bytes): - names = os.listdir(dirname) - if dironly: - for name in names: - if os.path.isdir(os.path.join(dirname, name)): - yield name - else: - yield from names - else: - with os.scandir(dirname) as it: - for entry in it: - try: - if not dironly or entry.is_dir(): - yield entry.name - except OSError: - pass + with os.scandir(dirname) as it: + for entry in it: + try: + if not dironly or entry.is_dir(): + yield entry.name + except OSError: + pass except OSError: return |