mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #25911: Restored support of bytes paths in os.walk() on Windows.

Browse source
This commit is contained in:
Serhiy Storchaka 2016-02-08 16:24:15 +02:00
commit 79ad897052
3 changed files with 41 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Lib/test/test_os.py
View file

@ -790,10 +790,10 @@ class WalkTests(unittest.TestCase):
# Wrapper to hide minor differences between os.walk and os.fwalk
# to tests both functions with the same code base
def walk(self, directory, **kwargs):
def walk(self, top, **kwargs):
if 'follow_symlinks' in kwargs:
kwargs['followlinks'] = kwargs.pop('follow_symlinks')
return os.walk(directory, **kwargs)
return os.walk(top, **kwargs)
def setUp(self):
join = os.path.join
@ -944,11 +944,10 @@ class WalkTests(unittest.TestCase):
class FwalkTests(WalkTests):
"""Tests for os.fwalk()."""
def walk(self, directory, **kwargs):
for root, dirs, files, root_fd in os.fwalk(directory, **kwargs):
def walk(self, top, **kwargs):
for root, dirs, files, root_fd in os.fwalk(top, **kwargs):
yield (root, dirs, files)
def _compare_to_walk(self, walk_kwargs, fwalk_kwargs):
"""
compare with walk() results.
@ -1019,6 +1018,19 @@ class FwalkTests(WalkTests):
os.unlink(name, dir_fd=rootfd)
os.rmdir(support.TESTFN)
class BytesWalkTests(WalkTests):
"""Tests for os.walk() with bytes."""
def walk(self, top, **kwargs):
if 'follow_symlinks' in kwargs:
kwargs['followlinks'] = kwargs.pop('follow_symlinks')
for broot, bdirs, bfiles in os.walk(os.fsencode(top), **kwargs):
root = os.fsdecode(broot)
dirs = list(map(os.fsdecode, bdirs))
files = list(map(os.fsdecode, bfiles))
yield (root, dirs, files)
bdirs[:] = list(map(os.fsencode, dirs))
bfiles[:] = list(map(os.fsencode, files))
class MakedirTests(unittest.TestCase):
def setUp(self):