cpython: 48e573e0a610 (original) (raw)

Mercurial > cpython

Issue #25596: Falls back to listdir in glob for bytes paths on Windows. [#25596]

Serhiy Storchaka storchaka@gmail.com
date	Wed, 07 Sep 2016 09:49:42 +0300
parents	1705cde6266d
children	e62ac2ed0fc4
files	Lib/glob.py
diffstat	1 files changed, 16 insertions(+), 7 deletions(-)[+] [-] Lib/glob.py 23

line wrap: on

line diff

--- a/Lib/glob.py +++ b/Lib/glob.py @@ -118,13 +118,22 @@ def _iterdir(dirname, dironly): else: dirname = os.curdir try:

   with os.scandir(dirname) as it:[](#l1.7)

               if not dironly or entry.is_dir():[](#l1.10)

                   yield entry.name[](#l1.11)

   if os.name == 'nt' and isinstance(dirname, bytes):[](#l1.14)

       names = os.listdir(dirname)[](#l1.15)

               if os.path.isdir(os.path.join(dirname, name)):[](#l1.18)

       with os.scandir(dirname) as it:[](#l1.23)

                   if not dironly or entry.is_dir():[](#l1.26)

                       yield entry.name[](#l1.27)

               except OSError:[](#l1.28)