From 1c5936e19e7935f83428d5b324a09dd1ff68ec7d Mon Sep 17 00:00:00 2001 From: palaviv Date: Wed, 11 May 2016 17:12:18 +0300 Subject: [PATCH] os: Update walk() to use ilistdir(). --- os/os/__init__.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/os/os/__init__.py b/os/os/__init__.py index 8613d10e..dcf10426 100644 --- a/os/os/__init__.py +++ b/os/os/__init__.py @@ -142,14 +142,14 @@ def listdir(path="."): def walk(top, topdown=True): files = [] dirs = [] - for dirent in ilistdir_ex(top): - mode = dirent[3] << 12 - fname = dirent[4].split(b'\0', 1)[0] + for dirent in ilistdir(top): + mode = dirent[1] << 12 + fname = fsdecode(dirent[0]) if stat_.S_ISDIR(mode): - if fname != b"." and fname != b"..": - dirs.append(fsdecode(fname)) + if fname != "." and fname != "..": + dirs.append(fname) else: - files.append(fsdecode(fname)) + files.append(fname) if topdown: yield top, dirs, files for d in dirs: