saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix unicode directory listing on py2

Browse source
This commit is contained in:
Daniel A. Wozniak 2018-07-31 01:52:24 +00:00
parent 69f81214d1
commit 9b462394b2
No known key found for this signature in database
GPG key ID: 166B9D2C06C82D61
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/utils/path.py
View file

@ -406,5 +406,8 @@ def os_walk(top, *args, **kwargs):
This is a helper than ensures that all paths returned from os.walk are
unicode.
'''
for item in os.walk(salt.utils.stringutils.to_str(top), *args, **kwargs):
top_query = salt.utils.stringutils.to_str(top)
if salt.utils.platform.is_windows() and six.PY2:
top_query = top
for item in os.walk(top_query, *args, **kwargs):
yield salt.utils.data.decode(item, preserve_tuples=True)