[Python-checkins] cpython (3.5): Fixed a bug in os.walk() with bytes path on Windows caused by merging fixes

[serhiy.storchaka]

https://hg.python.org/cpython/rev/9bffe39e8273
changeset:   100314:9bffe39e8273
branch:      3.5
parent:      100312:ce5bf3290621
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Wed Feb 24 13:03:54 2016 +0200
summary:
  Fixed a bug in os.walk() with bytes path on Windows caused by merging fixes
for issues #25995 and #25911.

files:
  Lib/os.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/os.py b/Lib/os.py
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -369,7 +369,7 @@
             # Note that scandir is global in this module due
             # to earlier import-*.
             scandir_it = scandir(top)
-        entries = list(scandir(top))
+        entries = list(scandir_it)
     except OSError as error:
         if onerror is not None:
             onerror(error)

-- 
Repository URL: https://hg.python.org/cpython