(original) (raw)

changeset: 100314:9bffe39e8273 branch: 3.5 parent: 100312:ce5bf3290621 user: Serhiy Storchaka storchaka@gmail.com date: Wed Feb 24 13:03:54 2016 +0200 files: Lib/os.py description: Fixed a bug in os.walk() with bytes path on Windows caused by merging fixes for issues #25995 and #25911. diff -r ce5bf3290621 -r 9bffe39e8273 Lib/os.py --- a/Lib/os.py Wed Feb 24 12:05:50 2016 +0200 +++ b/Lib/os.py Wed Feb 24 13:03:54 2016 +0200 @@ -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) /storchaka@gmail.com