mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 01:18:58 +00:00
Py3 compatibility fixes.
This commit is contained in:
parent
47412fc10e
commit
df76a05c44
@ -2,15 +2,17 @@
|
||||
'''
|
||||
Set up the correct search system
|
||||
'''
|
||||
from __future__ import absolute_import
|
||||
|
||||
# Import python libs
|
||||
from __future__ import absolute_import
|
||||
import os
|
||||
|
||||
# Import salt libs
|
||||
import salt.minion
|
||||
import salt.loader
|
||||
import salt.utils
|
||||
|
||||
# Import 3rd-party libs
|
||||
import salt.ext.six as six
|
||||
|
||||
|
||||
@ -76,7 +78,7 @@ def iter_roots(roots):
|
||||
'saltenv': <saltenv>,
|
||||
'cont': <contents>}
|
||||
'''
|
||||
for saltenv, dirs in roots.items():
|
||||
for saltenv, dirs in six.iteritems(roots):
|
||||
for dir_ in dirs:
|
||||
if not os.path.isdir(dir_):
|
||||
continue
|
||||
|
Loading…
Reference in New Issue
Block a user