summaryrefslogtreecommitdiffstats
path: root/Lib/os.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2016-02-24 11:03:54 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2016-02-24 11:03:54 (GMT)
commite14c07e4e469a91d74546db9980699b4fbed03db (patch)
tree0a07f6e28f98b8e04a23c10a17f118bfb1fc1f91 /Lib/os.py
parent205e75bb629408d850efd6659c87ba1f8512b44b (diff)
downloadcpython-e14c07e4e469a91d74546db9980699b4fbed03db.zip
cpython-e14c07e4e469a91d74546db9980699b4fbed03db.tar.gz
cpython-e14c07e4e469a91d74546db9980699b4fbed03db.tar.bz2
Fixed a bug in os.walk() with bytes path on Windows caused by merging fixes
for issues #25995 and #25911.
Diffstat (limited to 'Lib/os.py')
-rw-r--r--Lib/os.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/os.py b/Lib/os.py
index a49e7ce..e32cd6b 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -369,7 +369,7 @@ def walk(top, topdown=True, onerror=None, followlinks=False):
# 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)