Optomize if statement

This commit is contained in:
Daniel A. Wozniak 2018-07-31 09:14:27 -07:00
parent 9b462394b2
commit 47e158b9f0
No known key found for this signature in database
GPG key ID: 166B9D2C06C82D61

View file

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